1. 03 8月, 2016 16 次提交
    • J
      Stop 'git push' over HTTP early · b8f754dd
      Jacob Vosmaer 提交于
      Before this change we always let users push Git data over HTTP before
      deciding whether to accept to push. This was different from pushing
      over SSH where we terminate a 'git push' early if we already know the
      user is not allowed to push.
      
      This change let Git over HTTP follow the same behavior as Git over
      SSH. We also distinguish between HTTP 404 and 403 responses when
      denying Git requests, depending on whether the user is allowed to know
      the project exists.
      b8f754dd
    • F
      Merge branch 'fix-filter-input-alignment' into 'master' · 132a81f4
      Fatih Acet 提交于
      Fix filter input alignment
      
      ## What does this MR do?
      If you carefully observe the filter inputs on the [issues page](https://gitlab.com/gitlab-org/gitlab-ce/issues) and the [projects dashboard page](https://gitlab.com/dashboard/projects), you will notice that those input fields are actually a few pixels lower than the UI elements beside them (More so for the projects dashboard page than the issues page). This MR fixes that alignment issue so that they are aligned to the buttons on their right.
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be
      
      ## Why was this MR needed?
      Improves the existing UI
      
      ## What are the relevant issue numbers?
      Closes #20559 
      
      ## Screenshots (if relevant)
      Before
      ![Screen_Shot_2016-08-02_at_5.42.28_PM](/uploads/8530fc6c9ce20f28ae74b950bc1bd6be/Screen_Shot_2016-08-02_at_5.42.28_PM.png)
      
      After
      ![Screen_Shot_2016-08-02_at_5.49.28_PM](/uploads/ec20e68045c2190aec52e5f059d1a3bc/Screen_Shot_2016-08-02_at_5.49.28_PM.png)
      
      After (with color markings)
      ![Screen_Shot_2016-08-02_at_5.49.25_PM](/uploads/6e032b1ffb438018f6fadf294c3cebd3/Screen_Shot_2016-08-02_at_5.49.25_PM.png)
      
      Before
      ![Screen_Shot_2016-08-02_at_5.41.19_PM](/uploads/11a3c30d0290328bb3298bc392facf9f/Screen_Shot_2016-08-02_at_5.41.19_PM.png)
      
      After
      ![Screen_Shot_2016-08-02_at_5.49.47_PM](/uploads/f8e20346a19dc67cc3e54788dc0e72fb/Screen_Shot_2016-08-02_at_5.49.47_PM.png)
      
      After (with color markings)
      ![Screen_Shot_2016-08-02_at_5.49.58_PM](/uploads/1839d5681ab2f3518609004511af86a6/Screen_Shot_2016-08-02_at_5.49.58_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5633
      132a81f4
    • A
      Merge branch 'doc-markdown-move' into 'master' · e63729d9
      Achilleas Pipinellis 提交于
      Move markdown doc to the right location
      
      
      
      See merge request !5635
      e63729d9
    • A
      Move markdown doc to the right location · 1a9431b9
      Achilleas Pipinellis 提交于
      [ci skip]
      1a9431b9
    • J
      Merge branch 'discussion-reply-button-performance' into 'master' · 195b20e1
      Jacob Schatz 提交于
      Remove delay when hitting Reply... button on page with a lot of comments
      
      Every time the "Reply..." button was hit, a new `GLForm` was instantiated (which is fine), which would then call `GitLab.GfmAutoComplete.setup()` without specifying which textarea we needed autocompletion on, which resulted in `GitLab.GfmAutoComplete.setup` iterating through every single textarea on the page. On a page with a lot of comments, where each comment would have its own textarea that will be used to edit the comment, this would take a long time and cause the whole page to hang for 2 seconds when a  "Reply..." button was clicked.
      
      See merge request !5602
      195b20e1
    • J
      Merge branch 'convert-trans-bg-to-css' into 'master' · 35529007
      Jacob Schatz 提交于
      Convert image diff background image to CSS
      
      ## What does this MR do?
      Replaces the `trans_bg.gif` image used for image diff background image with a CSS implementation of the same background image
      
      ## Are there points in the code the reviewer needs to double check?
      None
      
      ## Why was this MR needed?
      Uses CSS to replace the use of an image so that webpage rendering is slightly improved
      
      ## What are the relevant issue numbers?
      Closes #20500 
      
      ## Screenshots (if relevant)
      Before:
      ![Screen_Shot_2016-08-01_at_12.29.10_PM](/uploads/8269877c561c29e6b0ca988079ff3fc6/Screen_Shot_2016-08-01_at_12.29.10_PM.png)
      
      After:
      ![Screen_Shot_2016-08-01_at_12.29.16_PM](/uploads/cc88848b9c0e044445d19b889fd79271/Screen_Shot_2016-08-01_at_12.29.16_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5598
      35529007
    • D
      Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' · 6c519b7a
      Douwe Maan 提交于
      Add simple identifier to public SSH keys
      
      ## What does this MR do?
      Adds a simple identifier of user_name + hostname to public SSH keys
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      To help people identify keys when they export them
      
      ## What are the relevant issue numbers?
      #18866 
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ -] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ -] API support added
      - Tests
        - [ x] Added for this feature/bug
        - [ x] All builds are passing
      - [ x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      Closes #18866
      
      See merge request !5614
      6c519b7a
    • D
      Merge branch 'rs-external-issue-tracker-redirect' into 'master' · b69cc523
      Douwe Maan 提交于
      Redirect to external issue tracker from `/issues`
      
      Prior, in order to display the correct link to "Issues" in the project
      navigation, we were performing a check against the project to see if it
      used an external issue tracker, and if so, we used that URL. This was
      inefficient.
      
      Now, we simply _always_ link to `namespace_project_issues_path`, and
      then in the controller we redirect to the external tracker if it's
      present.
      
      This also removes the need for the `url_for_issue` helper. Bonus! 🎉
      
      See merge request !5608
      b69cc523
    • C
      Fix filter input alignment · 51bcdfb7
      Clement Ho 提交于
      51bcdfb7
    • D
      Merge branch 'convert-switch-icon-to-font' into 'master' · 8c8bdb79
      Dmitriy Zaporozhets 提交于
      Convert switch icon into icon font
      
      ## What does this MR do?
      Converts the switch icon into the exchange icon from font awesome
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be any
      
      ## Why was this MR needed?
      
      *  Decreases an external resource for the repository compare page
      *  Icon font provides a sharper image for displays with higher pixel resolutions
      
      ## What are the relevant issue numbers?
      Closes #20508 
      
      ## Screenshots (if relevant)
      Before:
      ![Screen_Shot_2016-08-01_at_3.06.06_PM](/uploads/6ad46cc6dff98ec534e1f5a0fe556fa7/Screen_Shot_2016-08-01_at_3.06.06_PM.png)
      
      After:
      ![Screen_Shot_2016-08-01_at_3.06.10_PM](/uploads/3cb11c40cbba398f9986a4cc6b3a7e4c/Screen_Shot_2016-08-01_at_3.06.10_PM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5603
      8c8bdb79
    • S
      Merge branch 'job/update-workflow-links' into 'master' · bbb044e1
      Stan Hu 提交于
      link the engineering workflow document from process and contributing
      
      ## What does this MR do?
      
      Add links to process and contributing to the engineering workflow document. 
      
      ## Are there points in the code the reviewer needs to double check?
      
      no.
      
      ## Why was this MR needed?
      
      The engineering workflow document is very important to Inc developers, but was hard to find.
      
      ## What are the relevant issue numbers?
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      not relevant
      
      See merge request !5625
      bbb044e1
    • D
      Merge branch 'branches-ending-with-json' into 'master' · f4cb04da
      Douwe Maan 提交于
      Allow branch names ending with .json for graph and network page
      
      ## What does this MR do?
      
      Allow branch names to end with `.json` for graph and network page.
      
      ## Why was this MR needed?
      
      Displaying branches ending on `.json` in repository view crashes because links to graph and network page can not be determined.
      
      ## What are the relevant issue numbers?
      
      fixes #20462, #19585
      
      See merge request !5579
      f4cb04da
    • F
      Merge branch 'expand-commit-message-view' into 'master' · 90c277aa
      Fatih Acet 提交于
      Expand commit message width in repo view
      
      ## What does this MR do?
      Expands the commit message width in repo view to take advantage of the unused white space (under the history href)
      
      ## Are there points in the code the reviewer needs to double check?
      Just need to make sure there aren't any side effects
      
      ## Why was this MR needed?
      To take advantage of the unused space on repo views
      
      ## What are the relevant issue numbers?
      Closes #20225 
      
      ## Screenshots
      Before:
      ![Screen_Shot_2016-07-27_at_11.10.22_AM](/uploads/1f2c604ac6d4ede2bac67179cfe77b20/Screen_Shot_2016-07-27_at_11.10.22_AM.png)
      
      After:
      ![Screen_Shot_2016-07-27_at_11.08.55_AM](/uploads/34a36c884a06fd6cfd9b6512d1230196/Screen_Shot_2016-07-27_at_11.08.55_AM.png)
      
      ## Does this MR meet the acceptance criteria?
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] Added tests
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5494
      90c277aa
    • R
      Merge branch 'update-templates-for-8-11' into 'master' · b5eb94ea
      Robert Speicher 提交于
      Add and update vendored templates for 8.11
      
      [ci skip]
      
      See merge request !5626
      b5eb94ea
    • C
      Expand commit message width in repo view · e4c517a6
      Clement Ho 提交于
      e4c517a6
    • R
      Add and update templates for 8.11 · 0ee33149
      Ruben Davila 提交于
      0ee33149
  2. 02 8月, 2016 24 次提交