1. 06 3月, 2015 1 次提交
  2. 05 3月, 2015 23 次提交
  3. 04 3月, 2015 16 次提交
    • R
      Merge branch 'connect_gitlab_buttons_doc' into 'master' · ba215e9c
      Robert Schilling 提交于
      Connect GitLab buttons doc
      
      The "GitLab buttons in Gmail" documentation was not linked from anywhere else.
      
      Instead of assuming that these docs are not current, or should not be accessible, I've linked to them from doc/integrations/README.md.
      
      If linking is the less desirable approach, please advise.
      
      See merge request !339
      ba215e9c
    • E
      Merge branch 'connect_gitlab_buttons_doc' of gitlab.com:perforce/gitlab-ce... · 535a3fa4
      Ewan Edwards 提交于
      Merge branch 'connect_gitlab_buttons_doc' of gitlab.com:perforce/gitlab-ce into connect_gitlab_buttons_doc
      535a3fa4
    • E
    • E
      The "GitLab buttons in Gmail" document was not linked from anywhere · f04847a3
      Ewan Edwards 提交于
      else. It is now linked.
      f04847a3
    • D
      Add changelog entry. · 53aec08d
      Douwe Maan 提交于
      53aec08d
    • M
      Merge branch 'autosave-new-issuables' into 'master' · 8be36a2c
      Marin Jankovski 提交于
      Autosave title and description of new issues/MRs.
      
      Closes #2048.
      
      See merge request !1595
      8be36a2c
    • M
      Merge branch 'commits_statistic' into 'master' · 8e7e77e4
      Marin Jankovski 提交于
      Commits statistic grammar
      
      Fixes #2089
      
      Changed spelling from Commits statistic to Commit statistics
      
      See merge request !1625
      8e7e77e4
    • M
      Merge branch 'build_page_text' into 'master' · 094f4895
      Marin Jankovski 提交于
      Changed to 'View Build Page'
      
      Fixes #2093
      
      Changes 'Build Page' to 'View build page'
      
      See merge request !1626
      094f4895
    • D
      Remove pull-review badge since we dont use it · f24e46b8
      Dmitriy Zaporozhets 提交于
      f24e46b8
    • S
      Spelling change Commit Statistics · b5ec0d6d
      Sabba Petri 提交于
      b5ec0d6d
    • S
      Changed casing · dc7c90f1
      Sabba Petri 提交于
      dc7c90f1
    • S
      Changed to 'View Build Page' · 443cf972
      Sabba Petri 提交于
      443cf972
    • M
      Merge branch 'fix-namespace-merge-request-url' into 'master' · 3d6d0e1e
      Marin Jankovski 提交于
      Fix namespace in merge request url building
      
      Changes in 42387b73 now require namespace specification and broke abc69c89.
      
      There are additional helper functions in c530ca00, but this seemed easier not to rely on them.
      
      See merge request !363
      3d6d0e1e
    • S
      Fix URL builder to use GitlabRoutingHelper · 2088cee9
      Stan Hu 提交于
      2088cee9
    • M
      Merge branch 'fix-edit-note-with-votes' into 'master' · 66fa4b09
      Marin Jankovski 提交于
      Fix server error when editing a note to "+1" or "-1"
      
      ### Summary
      
      If a user edits a comment with "+1" or "-1" in the beginning, the POST returns an Internal Server error. (issue #1151). This merge request resolves that error.
      
      ### Steps to reproduce
      
      1. Comment on an issue with "Test comment".
      2. Edit the issue.
      3. Write "+1" and click "Save Comment".
      
      ### Expected behavior
      
      The edited note should be saved and refreshed. Any previous upvotes/downvotes from the user should contain a strikethrough.
      
      ### Observed behavior
      
      Internal Error
      
      ### Relevant logs
      
      ```
      Started PUT "/avocode/avocode-manager/notes/4996" for 185.33.136.107 at 2015-02-28 17:11:53 +0100
      Processing by Projects::NotesController#update as JS
      Parameters: {"utf8"=>"✓", "authenticity_token"=>"*removed*", "note"=>{"note"=>"+1\r\n\r\nYes"}, "commit"=>"Save Comment", "project_id"=>"avocode/avocode-manager", "id"=>"4996"}
      Completed 500 Internal Server Error in 86ms
      ActionView::Template::Error (undefined method `each' for nil:NilClass):
      28: %span.note-last-update
      29: = note_timestamp(note)
      30:
      31: - if note.superceded?(@notes)
      32: - if note.upvote?
      33: %span.vote.upvote.label.label-gray.strikethrough
      34: %i.fa.fa-thumbs-up
      app/models/note.rb:495:in `superceded?'
      app/views/projects/notes/_note.html.haml:31:in `_app_views_projects_notes__note_html_haml___812277000516355462_69988235638820'
      app/controllers/projects/notes_controller.rb:71:in `note_to_html'
      app/controllers/projects/notes_controller.rb:103:in `render_note_json'
      app/controllers/projects/notes_controller.rb:39:in `block (2 levels) in update'
      app/controllers/projects/notes_controller.rb:38:in `update'
      ```
      
      ### Fix
      
      It turns out no tests were present for the "Edit Issue" functionality. I added spinach tests to exercise this and reproduced the error.
      
      Most of the routes in `notes_controller.rb` appear to render all notes for the given discussion. `_form.html.haml` needs the full list of notes commented by the user to add strikethroughs for older upvotes/downvotes. However, only the `index` route appeared to obtain this information. The fix is to add a `before_filter` to obtain all the user's notes beforehand, except in the delete case where this information is not needed.
      
      Things to watch: `NotesFinder` needs `target_type` and `target_id` to determine what to do. I'm not sure if there is a conscious effort to phase these keywords out in favor of `noteable_type` and `noteable_id`.
      
      See merge request !360
      66fa4b09
    • D
      Merge branch 'project-existence-leak' into 'master' · 8c47a72a
      Dmitriy Zaporozhets 提交于
      Don't leak information about private project existence via Git-over-SSH/HTTP.
      
      Fixes #2040 and https://gitlab.com/gitlab-org/gitlab-ce/issues/343.
      
      Both `Grack::Auth` (used by Git-over-HTTP) and `Api::Internal /allowed` (used by gitlab-shell/Git-over-SSH) now return a generic "Not Found" error when the project exists but the user doesn't have access to it.
      
      See merge request !1578
      8c47a72a