summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-167-25/+55
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
| | * \ \ \ \ Merge branch 'master' into filter-labelfilter-labelDouwe Maan2015-10-14129-858/+1630
| | |\ \ \ \ \
| | * | | | | | Allow dashboard and group issues/MRs to be filtered by labelDouwe Maan2015-10-146-20/+55
| | | | | | | |
| * | | | | | | Merge branch 'fix_svn_link' into 'master' Robert Speicher2015-10-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import from SVN link See merge request !1617
| | * | | | | | | Fix import from SVN linkDrew Blessing2015-10-161-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'friday-meltdown-indexes' into 'master' Yorick Peterse2015-10-163-1/+21
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | See merge request !1623
| | * | | | | | | | Added indexes for notes.line_code and CI columnsYorick Peterse2015-10-163-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds indexes for the following columns: * notes.line_code * ci_projects.gitlab_id * ci_projects.shared_runners_enabled * ci_builds.type * ci_builds.status
| * | | | | | | | | Merge branch 'gghs-0.3.0' into 'master' Robert Speicher2015-10-162-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-git-http-server 0.3.0 for GitLab 8.1 See merge request !1605
| | * | | | | | | | Use gitlab-git-http-server 0.3.0gghs-0.3.0Jacob Vosmaer2015-10-152-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge branch 'gitlab-git-http-server-version' into 'master' Robert Speicher2015-10-163-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track compatible gitlab-git-http-server version The 'git archive' changes in GitLab 8.1 require a version of gitlab-git-http-server that is incompatible with GitLab 8.0, so we need to keep track of this now. See merge request !1603
| | * | | | | | | | Track compatible gitlab-git-http-server versiongitlab-git-http-server-versionJacob Vosmaer2015-10-153-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'improve-typography' into 'master' Dmitriy Zaporozhets2015-10-161-41/+35
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve typography See merge request !1622
| | * | | | | | | | | Improve markdown typography scssDmitriy Zaporozhets2015-10-161-41/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Merge branch 'fix-wiki-padding' into 'master' Dmitriy Zaporozhets2015-10-163-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont put padding on typography but on holder elements instead Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes wrong padding of wiki content. cc @JobV @skyruler See merge request !1620
| | * | | | | | | | | Add extra padding to some markdown pagesDmitriy Zaporozhets2015-10-162-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | Dont put padding on typography but on holder elements insteadDmitriy Zaporozhets2015-10-161-2/+0
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Merge branch 'compact-select' into 'master' Dmitriy Zaporozhets2015-10-161-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make selectbox options more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1619
| | * | | | | | | | | Increase dropdown padding a bitDmitriy Zaporozhets2015-10-161-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Make selectbox options more compactDmitriy Zaporozhets2015-10-161-1/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Merge branch 'comment-highlight' into 'master' Dmitriy Zaporozhets2015-10-162-0/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight comment based on anchor in URL Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fix for #2954 See merge request !1618
| | * | | | | | | | | Highlight comment based on anchor in URLDmitriy Zaporozhets2015-10-162-0/+5
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Merge branch 'ci-commits-gl-project-id-index' into 'master' Yorick Peterse2015-10-162-1/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index on ci_commits.gl_project_id See merge request !1616
| | * | | | | | | | Add index on ci_commits.gl_project_idci-commits-gl-project-id-indexYorick Peterse2015-10-162-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3086
| * | | | | | | | | Merge branch 'last-commit-project-page' into 'master' Dmitriy Zaporozhets2015-10-167-0/+68
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show last commit from default branch on project home page Implements #2705 Screenshot: ![Screenshot_2015-10-15_19.03.29](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef1cfa6764ab0ec5e7584ae61980a47d/Screenshot_2015-10-15_19.03.29.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1610
| | * | | | | | | | Change order of sha and commit message on project home pageDmitriy Zaporozhets2015-10-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | Add changelog itemlast-commit-project-pageDmitriy Zaporozhets2015-10-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | Add tests for last commit info on project home pageDmitriy Zaporozhets2015-10-163-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | Show last commit from default branch on project home pageDmitriy Zaporozhets2015-10-154-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Merge branch 'notify-mr-upon-branch-presence-change' into 'master' Douwe Maan2015-10-169-19/+127
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a system note and update relevant merge requests when a branch is deleted or re-added If a branch is deleted with an open merge request, amended offline, and then pushed again, GitLab doesn't bother to update the merge request even though the last commit ID and/or code may have changed. This MR ensures that each push will update any relevant merge requests and adds a system note if this happens as well. The new messages look like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6581eea069cd8e485b7fa4187ed4c043/image.png) Closes #2926 See merge request !1601
| | * | | | | | | | Reorder system note verb to say "Restored source branch X" instead of ↵Stan Hu2015-10-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Source branch X restored"
| | * | | | | | | | Add spec for refresh service adding notes to restored branchesStan Hu2015-10-163-16/+17
| | | | | | | | | |
| | * | | | | | | | Rubocop fixStan Hu2015-10-151-1/+1
| | | | | | | | | |
| | * | | | | | | | Add system notes for restored branchesStan Hu2015-10-152-5/+29
| | | | | | | | | |
| | * | | | | | | | Memoize merge request source branchesStan Hu2015-10-151-8/+9
| | | | | | | | | |
| | * | | | | | | | Improve SystemNote interface for branch add/restore caseStan Hu2015-10-154-15/+19
| | | | | | | | | |
| | * | | | | | | | Preserve target branchStan Hu2015-10-151-1/+5
| | | | | | | | | |
| | * | | | | | | | Add a system note and update relevant merge requests when a branch is ↵Stan Hu2015-10-158-24/+98
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted or re-added If a branch is deleted with an open merge request, amended offline, and then pushed again, GitLab doesn't bother to update the merge request even though the last commit ID and/or code may have changed. This MR ensures that each push will update any relevant merge requests and adds a system note if this happens as well. Closes #2926
| * | | | | | | | Merge pull request #9740 from ashleyhindle/patch-1Stan Hu2015-10-151-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Changed loose to lose
| | * | | | | | | | Changed loose to loseAshley Hindle2015-10-161-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge branch 'when-syntax' into 'master' Robert Speicher2015-10-1610-126/+283
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement when syntax in .gitlab-ci.yml See merge request !1606
| | * | | | | | | | Correct spec description typoRobert Speicher2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | Update CI YAML docswhen-syntaxRobert Speicher2015-10-151-4/+5
| | | | | | | | | |
| | * | | | | | | | Shut up, RubocopRobert Speicher2015-10-151-1/+1
| | | | | | | | | |
| | * | | | | | | | Backticks around when typesKamil Trzcinski2015-10-151-1/+1
| | | | | | | | | |
| | * | | | | | | | Fix specsKamil Trzcinski2015-10-153-5/+6
| | | | | | | | | |
| | * | | | | | | | Implement when syntax in .gitlab-ci.ymlKamil Trzcinski2015-10-1510-124/+279
| | | | | | | | | |
| * | | | | | | | | Remove 8.0-only steps from the 8.1 update guideRobert Speicher2015-10-151-89/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds a preamble note that a working 8.0 installation (i.e., gitlab-git-http-server, updated Nginx/Apache configs) is required before proceeding. [ci skip]
| * | | | | | | | | Remove notes about CI migration from 8.1 update guideRobert Speicher2015-10-151-10/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'sentences-end-in-periods' into 'master' Robert Speicher2015-10-151-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sentences end in periods. [ci skip] See merge request !1604
| | * | | | | | | | Sentences end in periods.sentences-end-in-periodsDouwe Maan2015-10-151-1/+2
| | | | | | | | | |