summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
|
* 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
| | |
* | | Merge branch 'rs-prepare-8-1-0' into 'master' Robert Speicher2015-10-152-2/+230
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prepare 8.1 documentation [ci skip] See merge request !1612
| * | | Add 8.0-to-8.1 update guideRobert Speicher2015-10-151-0/+228
| | | |
| * | | Update Installation doc for 8-1-stableRobert Speicher2015-10-151-2/+2
| | | |
* | | | Merge branch 'update-redcarpet' into 'master' Robert Speicher2015-10-152-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Update redcarpet gem. Fixes gem memory leak Fixes #2773 See merge request !1607
| * | | Update redcarpet gem. Fixes gem memory leakupdate-redcarpetDmitriy Zaporozhets2015-10-152-3/+3
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'build-view-ui-fixes' into 'master' Kamil Trzciński2015-10-153-6/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Build View UI fixes See merge request !1608
| * | Added missing comma [ci skip]Kamil Trzcinski2015-10-151-1/+1
| | |
| * | Make the builds view and warning notice nicerKamil Trzcinski2015-10-153-6/+7
|/ /
* | Merge branch 'rs-markdown-typography' into 'master' Dmitriy Zaporozhets2015-10-156-36/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Markdown typography CSS fixes The `!important` flags recently added to the `md-typography` mixin's `pre` elements were overriding the background and foreground colors for syntax highlighting. | Before | After | |:------:|:-----:| | ![Screen_Shot_2015-09-25_at_3.32.32_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/802163bd9f46864ac89e7be165951f07/Screen_Shot_2015-09-25_at_3.32.32_PM.png) | ![Screen_Shot_2015-09-25_at_3.33.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6be72036653378405320085324dff5ad/Screen_Shot_2015-09-25_at_3.33.30_PM.png) | See merge request !1442
| * | Update highlight themes so they always have the correct colorsrs-markdown-typographyRobert Speicher2015-10-145-34/+26
| | |
| * | Allow highlight themes to override `pre` colorsRobert Speicher2015-10-141-2/+2
| | |
* | | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'Dmitriy Zaporozhets2015-10-153-2/+16
|\ \ \
| * | | Fix bug where merge request comments created by API would not trigger ↵Stan Hu2015-10-103-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715
* | | | Fix builds view count indicatorKamil Trzcinski2015-10-152-5/+5
| | | |
* | | | Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-158-53/+259
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve invalidation of stored service password if the endpoint URL is changed (V2) New version of !1583, using the same failproof logic but this time mirroring the name and behaviour of the change-tracking methods of ActiveModel::Dirty in order to make it clearer and more natural. Added more tests to clarify the expected behaviour. This is an alternative to !1594 /cc @vsizov @rspeicher See merge request !1600
| * | | | Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-158-53/+259
| | | | | | | | | | | | | | | | | | | | | | | | | Password can now be specified at the same time as the new URL, and the service template admin pages now work.
* | | | | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-155-3/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve User.by_login performance This greatly speeds up the performance of `User.by_login`. I adopted some changes from @haynes in this patch, the credits go to him for coming up with those originally. Fixes #2341 See merge request !1545
| * | | | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-155-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance is improved in two steps: 1. On PostgreSQL an expression index is used for checking lower(email) and lower(username). 2. The check to determine if we're searching for a username or Email is moved to Ruby. Thanks to @haynes for suggesting and writing the initial implementation of this. Moving the check to Ruby makes this method an additional 1.5 times faster compared to doing the check in the SQL query. With performance being improved I've now also tweaked the amount of iterations required by the User.by_login benchmark. This method now runs between 900 and 1000 iterations per second.
* | | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-1537-36/+226
|\ \ \ \ \ \
| * | | | | | Added documentation on the various profiling toolsview-issue-performanceYorick Peterse2015-10-151-0/+56
| | | | | | |
| * | | | | | Fixed Rubocop styling issuesYorick Peterse2015-10-152-5/+5
| | | | | | |
| * | | | | | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-152-2/+2
| | | | | | |
View Lorry Controller Status