summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace namespace-specific application.js files with namespace-bundle.js files.rename-js-filesConnor Shea2016-07-159-8/+8
|
* Merge branch 'rs-describe-symbols' into 'master' Robert Speicher2016-07-1240-98/+98
|\ | | | | | | | | Avoid `describe`-ing symbols in specs See merge request !5195
| * Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-1241-110/+110
| |
* | Merge branch '18935-pipeline-button' into 'master' Jacob Schatz2016-07-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change new pipeline to run pipeline ## What does this MR do? Change text of button from `New pipeline` to `Run pipeline` ## What are the relevant issue numbers? Closes #18935 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_12.15.36_PM](/uploads/2e0413b802118781dc5a29c7f1c105b8/Screen_Shot_2016-07-06_at_12.15.36_PM.png) See merge request !5119
| * | Change new pipeline to run pipeline18935-pipeline-buttonAnnabel Dunstone2016-07-061-1/+1
| | |
* | | Update CHANGELOG for 8.9.6Robert Speicher2016-07-121-2/+5
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'approval-required-todo' into 'master' Robert Speicher2016-07-125-7/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add approval required todos Ports the 'approval required' todo type from EE - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/547 See merge request !5217
| * | | Add approval required todosapproval-required-todoSean McGivern2016-07-125-7/+14
| | | |
* | | | Merge branch '19659-sidebar-improvements' into 'master' Jacob Schatz2016-07-125-56/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Possible sidebar improvements based" ## What does this MR do? Cleans up the sidebar ## Are there points in the code the reviewer needs to double check? @dzaporozhets it looks like your screenshot has more padding on the left and right of the sidebar, but if you do that then the hamburger icon doesn't match the placement on the top nav, and it makes it look like icon is shifting back and forth. ## What are the relevant issue numbers? Part of #19659 ## Screenshots (if relevant) ![nav](/uploads/693d8a21bac464fc7dd40a51cb7dccda/nav.gif) See merge request !5211
| * | | | Change sidebar drop shadow to rgba19659-sidebar-improvementsAnnabel Dunstone2016-07-122-2/+1
| | | | |
| * | | | Remove toggle partial; Move pin link to top of side navAnnabel Dunstone2016-07-124-35/+38
| | | | |
| * | | | Remove icons from sidebar; remove darker theme color from pin & toggle buttonsAnnabel Dunstone2016-07-123-22/+1
| | |_|/ | |/| |
* | | | Merge branch 'remove-hound-config' into 'master' Stan Hu2016-07-123-99/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Hound CI and Teatro config ## What does this MR do? Since we moved to gitlab.com we don't use Hound CI and Teatro anymore. Instead we have rubocop. See merge request !5089
| * | | | Remove teatro configremove-hound-configRobert Schilling2016-07-052-95/+0
| | | | |
| * | | | Remove hound configRobert Schilling2016-07-051-4/+0
| | | | |
* | | | | Merge branch 'lock_for_issuable' into 'master' Douwe Maan2016-07-1210-14/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimistic locking for Issue and Merge Requests ## What does this MR do? It implements Optimistic Locking http://api.rubyonrails.org/classes/ActiveRecord/Locking/Optimistic.html for Issues and MRs but in a bit custom way. We use it for cases when either title or description field is involved in the change. ## Why was this MR needed? We have to prevent data losing. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/12940 ## Screenshots (if relevant) ![Screen_Shot_2016-07-09_at_15.33.02](/uploads/2efbe547a12fda93bce347fa711438d7/Screen_Shot_2016-07-09_at_15.33.02.png) See merge request !5146
| * | | | | Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-1210-14/+78
| | | | | |
* | | | | | Merge branch 'cache-todos-finder-calls' into 'master' Robert Speicher2016-07-126-38/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache todos pending/done dashboard query counts See #19273 See merge request !5175
| * | | | | | Cache todos pending/done dashboard query countsPaco Guzman2016-07-126-38/+62
| | | | | | |
* | | | | | | Merge branch 'remove-unused-helper' into 'master' Robert Speicher2016-07-122-9/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Remove unused RelativeUrl spec support file See merge request !5207
| * | | | | | We're not using them (and look at the typo)remove-unused-helperLin Jen-Shin2016-07-122-9/+0
| | | | | | |
* | | | | | | Merge branch 'bump-workhorse' into 'master' Douwe Maan2016-07-121-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-workhorse version for !5094 I think I've created this merge request shortly after I committed this, but it's missing now?? See merge request !5214
| * | | | | | Bump gitlab-workhorse version for !5094bump-workhorseLin Jen-Shin2016-07-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'fix-gh-rate-limit' into 'master' Douwe Maan2016-07-123-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub client requests when rate limit is disabled ## What does this MR do? GitHub Rate Limit API returns 404 when the rate limit is disabled. In this case we just want to return gracefully instead of spitting out an error. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? GitHub importer fails when rate limit is disabled in GitHub Enterprise. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/697 ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5191
| * | | | | | | Memoize response from `has_rate_limit?` to avoid extra API callfix-gh-rate-limitDouglas Barbosa Alexandre2016-07-121-1/+3
| | | | | | | |
| * | | | | | | Checks if rate limit is enabled instead of stubbing responseDouglas Barbosa Alexandre2016-07-121-2/+6
| | | | | | | |
| * | | | | | | Remove unnecessary context from GitHub client specDouglas Barbosa Alexandre2016-07-121-6/+4
| | | | | | | |
| * | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-121-0/+1
| | | | | | | |
| * | | | | | | Fix GItHub client requests when rate limit is disabledDouglas Barbosa Alexandre2016-07-122-0/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'read-multi-rendered-objects' into 'master' Douwe Maan2016-07-125-18/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObjectRenderer uses read_multi to read cache ## What does this MR do? Get cache rendered content in bulk ## What are the relevant issue numbers? #19273 ## 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) See merge request !5096
| * | | | | | | Object renderer read_multi rendered entries from Cacheread-multi-rendered-objectsPaco Guzman2016-07-125-18/+91
| | | | | | | |
* | | | | | | | Merge branch 'remove-group-avi-link' into 'master' Fatih Acet2016-07-121-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the group avatar link. ## What does this MR do? For group pages, e.g. https://gitlab.com/groups/gitlab-org, I see no reason to link to the avatar image itself when clicking on the avatar. If the user really wants to open the image, they can do so by right clicking and opening the image in a new tab. As mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/12806#note_12976019. cc: @fatihacet @alfredo1 See merge request !5196
| * | | | | | | | Remove the group avatar link.remove-group-avi-linkConnor Shea2016-07-121-2/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For group pages, e.g. https://gitlab.com/groups/gitlab-org, I see no reason to link to the avatar image itself when clicking on the avatar. If the user really wants to open the image, they can do so by right clicking and opening the image in a new tab.
* | | | | | | | Merge branch 'use-string-in-describe' into 'master' Douwe Maan2016-07-121-12/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer string for describe as of: https://gitlab.com/gitlab-org/gitlab-ce/blob/b7ba5fa06bfb434c9227a2175f936fc31fd3444f/doc/development/gotchas.md#dont-describe-symbols See merge request !5202
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-string-in-describeuse-string-in-describeLin Jen-Shin2016-07-1225-84/+146
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: Expire the branch cache after `git gc` runs Be explicit on merge request discussion variables Improve wording in UI guide Fix expandable diffs CHANGELOG was updated. Style of import project buttons were fixed in the new project page. api: expose {should,force}_remove_source_branch Fix typo in UI guide Add rule about adding new header tab to the ui guide Update the health_check gem to the latest release Display tooltip for "Copy to Clipboard" button (!5164) Remove icons from some buttons which already has text
| * | | | | | | | Prefer string for describe as of:Lin Jen-Shin2016-07-121-12/+12
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/blob/b7ba5fa06bfb434c9227a2175f936fc31fd3444f/doc/development/gotchas.md#dont-describe-symbols
* | | | | | | | Merge branch 'doc-refactor-permissions' into 'master' Achilleas Pipinellis2016-07-1210-133/+142
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor permissions.md - Move `permissions/permissions.md` to `user/permissions.md` - Remove wrong assumptions about group visibility - Merge CI `ci/permissions/README.md` to `user/permissions.md` ## What are the relevant issue numbers? Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/19414 See merge request !5210
| * | | | | | | Add 'Accept merge request' to permissions tabledoc-refactor-permissionsAchilleas Pipinellis2016-07-121-1/+1
| | | | | | | |
| * | | | | | | Change URLs to new permissions.md locationAchilleas Pipinellis2016-07-125-7/+7
| | | | | | | |
| * | | | | | | Change permissions URL in main readmeAchilleas Pipinellis2016-07-121-1/+1
| | | | | | | |
| * | | | | | | Move CI permissions to permissions.mdAchilleas Pipinellis2016-07-122-23/+2
| | | | | | | |
| * | | | | | | Move permissions/permissions.md to user/permissions.mdAchilleas Pipinellis2016-07-122-129/+132
| | | | | | | |
| * | | | | | | Small refactor and addition of CI permissionsAchilleas Pipinellis2016-07-121-13/+40
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '19711-many-git-gc-instances' into 'master' Stan Hu2016-07-123-19/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset project pushes_since_gc when we enqueue the git gc call ## What does this MR do? Reset counters just when we really enqueue the `git gc` command. So as this is part of the `#execute`method we throttle the enqueue and the reset (database statement) as we throttle the `#increment!` call. And we only call `#execute` if it's needed. ## What are the relevant issue numbers? Closes #19711 ## 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) See merge request !5201
| * | | | | | | Reset project pushes_since_gc when we enqueue the git gc callPaco Guzman2016-07-123-19/+48
| |/ / / / / /
* | | | | | | Merge branch 'dz-rename-personal-access-tokens' into 'master' Dmitriy Zaporozhets2016-07-121-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename profile navigation tab 'Personal Access Tokes' to 'Access Tokens' For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3749#note_12994215. We should not use more than 2 words for tab name See merge request !5187
| * | | | | | Update Access Tokens link title to match the text Dmitriy Zaporozhets2016-07-121-1/+1
| | | | | | |
| * | | | | | Rename profile navigation tab 'Personal Access Tokes' to 'Access Tokens'dz-rename-personal-access-tokensDmitriy Zaporozhets2016-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'dz-small-ui-improvements' into 'master' Dmitriy Zaporozhets2016-07-123-3/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove icons from some buttons which already has text Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 * remove plus icon from new milestone button on group milestone page * remove plus icon from new project button on group projects page * remove plus icon from milestone page See merge request !5050
| * | | | | | Remove icons from some buttons which already has textDmitriy Zaporozhets2016-07-013-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>