summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-178-28/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds dicussion icon and color change in system note links adds discussion icons and sticky note icon for other system notes for now fixes scss lint error adds faded commit lists hides first paragraph in commit list box css tweak for commit list system notes adds commit-list toggle functionality, css tweaks and css classnames more readable small css fix in header. makes links bold in system note renames class no-shade to hide-shade adds entry for this merge request in changelog removes commented line removes the avatar-icon from discussion header minor css tweaks to make the commit list alignment with header text uses monospaced font to make the commit list lined up with all removes icon from system note and align bullet list resolves scss lint warings adds helper function to extract system note message from first p tag adds helper functions to check commit list count and haml cleanup adds changelog entry under 8.14 adds changelog entry with changelog cli removes helper and regex and makes commit list li count using JS makes link in system note normal brakeman build failure resolved fixing rspec test based on new design for discussion shows system note in lowercase removes extra spaces from comments adds code commenting for functions adds semi-colon in some lines fixes rspec given when merge build success removes commented codes rewrite changelog yml file moves isMetaKey to common utils file fixes some indentation issues removes unnecessary variables and resolves some discussions replaces jQuery parent function with siblings fixes scss issues and variable spelling mistake uses constant rather using hardcoded number for visible li count in long commit list makes system note header all lowercase uses color variables and adjust gradient a little some minor changes for adding css classes renames functions name for readability changes changelog title minor scss newline changes makes system note less intrusive to a conversation
* Merge branch '23034-setup-test-env-in-prepare-stage' into 'master' Sean McGivern2016-11-171-2/+13
|\ | | | | | | | | | | | | tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the prepare stage Related to #23034 See merge request !7512
| * tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the ↵Nick Thomas2016-11-161-2/+13
| | | | | | | | prepare stage
* | Merge branch 'fix/trace-patch-updated-at' into 'master' Kamil Trzciński2016-11-163-5/+90
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the updated_at of a build while patching the trace ## What does this MR do? Fixes build patching trace. It should update the `updated_at` field of a build to make sure it will not be removed by `stuck_ci_builds_worker`. ## Are there points in the code the reviewer needs to double check? Construction of a test for the bug. ## Why was this MR needed? Please read #22087 for a reference. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #22087 See merge request !7146
| * | Add CHANGELOG entryfix/trace-patch-updated-atTomasz Maczukin2016-11-161-0/+4
| | |
| * | Update the updated_at of a build while patching the traceTomasz Maczukin2016-11-152-5/+86
| | |
* | | Merge branch 'related-mr-labels' into 'master' Annabel Dunstone Gray2016-11-163-8/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added colored labels to related MR list. ## What does this MR do? Added colored labels to related MR list. ## Are there points in the code the reviewer needs to double check? Yes, I think haml can be better. ## Why was this MR needed? There was an issue for this #21200 ## Screenshots (if relevant) ![Screen_Shot_2016-11-15_at_21.04.24](/uploads/b601f33f23cdc3318d01279e17deb096/Screen_Shot_2016-11-15_at_21.04.24.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes !21200 See merge request !7486
| * | | Fix SCSS linter errors.Didem Acet2016-11-161-8/+9
| | | |
| * | | Added colored labels to related MR list.Didem Acet2016-11-163-8/+36
| | | |
* | | | Merge branch 'explicitly-disable-eslint-inline' into 'master' Alfredo Sumaran2016-11-16149-148/+150
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicitly disable eslint inline ## What does this MR do? Explicitly disables eslint inline. I.E. `/* eslint-disable */` => `/* eslint-disable max-len, no-new, ... */` I used the script from https://gitlab.com/lbennett/eslint-dsblr. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? It will help refactor out eslint issues for older files. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7229
| * | | explicitly disable eslint inlineexplicitly-disable-eslint-inlineLuke "Jared" Bennett2016-11-15149-148/+150
| | |/ | |/|
* | | Merge branch 'fix-failing-user-without-projects-specs' into 'master' Sean McGivern2016-11-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix some failing specs due to missing access_requestable trait See merge request !7510
| * | | Fix some failing specs due to missing access_requestable traitNick Thomas2016-11-161-1/+1
| | | |
* | | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-167-61/+126
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project paths Closes #24496 See merge request !7480
| * | | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-167-61/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab-shell v3.6.6 would give project paths like so: * namespace/project gitlab-shell v4.0.0 can give project paths like so: * /namespace1/namespace2/project * /namespace/project * /path/to/repository/storage/namespace1/namespace2/project * /path/to/repository/storage/namespace/project
* | | | | Merge branch 'fix-shibboleth-auth-with-no-uid' into 'master' Rémy Coutable2016-11-162-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | fix shibboleth misconfigurations resulting in authentication bypass This merge request fixes #22267 where a misconfigured Shibboleth `HTTP_UID` or `HTTP_EPPN` could result in users being logged into an account that did not belong to them. See merge request !7428
| * | | | fix shibboleth misconfigurations resulting in authentication bypassfix-shibboleth-auth-with-no-uidBrian Neel2016-11-142-0/+8
| | | | |
* | | | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-11-163-1/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue where "Without projects" filter admin area shows 0 users incorrectly. Before this fix, if any outstanding group or project invitations exist the count show as 0. Fixes #3367 See merge request !6611
| * | | | | fix "Without projects" filterBen Bodenmiller2016-11-163-1/+24
| | | | | |
* | | | | | Merge branch '23824-activity-page-does-not-show-commits-comments' into 'master' Robert Speicher2016-11-164-5/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow commit note to be visible if repo is visible ## What does this MR do? It enforces the `:download_code` permission in `Event#visible_to_user?` for commit notes. Closes #23824 See merge request !7504
| * | | | | | Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-commentsRémy Coutable2016-11-164-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'user-dropdown-multiple-requests-fix' into 'master' Fatih Acet2016-11-162-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stopped multiple requests with dropdowns ## What does this MR do? Fixes an issue where the user dropdown would send 2 requests when the user opens the dropdown. ## What are the relevant issue numbers? Closes #24131 See merge request !7505
| * | | | | | | Stopped multiple requests with dropdownsuser-dropdown-multiple-requests-fixPhil Hughes2016-11-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening the user dropdown currently sends 2 requests. This has been changed so only one is sent Closes #24131
* | | | | | | | Merge branch 'issue-boards-counter-border-fix' into 'master' Fatih Acet2016-11-162-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards counter border when unauthorized ## What does this MR do? When the user is unauthorized & view issue boards, the border on the counter will not be the whole way around. This fixes that. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_13.03.36](/uploads/54d97f7f4114044aad3bdc78961a31c8/Screen_Shot_2016-11-16_at_13.03.36.png) ## What are the relevant issue numbers? Closes #23664 See merge request !7501
| * | | | | | | | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fixPhil Hughes2016-11-162-1/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When unauthorized the border on the counter in issue boards didn't span the whole way around Closes #23664
* | | | | | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-1611-54/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defer saving project services to the database if there are no user changes ## What does this MR do? It defers saving project services to the database as long as it is possible. It creates a project service when creating a project only if this project service has an active template. After that project services are saved on the first edit. ## Are there points in the code the reviewer needs to double check? - tests that used `build_missing_services` before the change - number of queries executed ## Why was this MR needed? Motivation in #22281 ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #22281 See merge request !6958
| * | | | | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-1611-54/+49
| | | | | | | |
* | | | | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-1611-83/+155
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search for a filename in a project Closes #23117 See merge request !7426
| * | | | | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-1611-83/+155
| | | | | | | | |
* | | | | | | | | Merge branch '21992-disable-access-requests-by-default' into 'master' Robert Speicher2016-11-1627-78/+122
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the "request access" functionality by default for new groups and projects Currently this feature is enabled by default, and additional action is required to disable it. Closes #21992 Closes !7011 See merge request !7425
| * | | | | | | | | Make access request specs explicitly enable or disable access requests as ↵Nick Thomas2016-11-1124-76/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required
| * | | | | | | | | Set 'request_access_enabled' false by defaultChris Wilson2016-11-113-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set request access for projects/groups to false by default. Request access implemented in !5286 8.10 was enabled by default.
* | | | | | | | | | Merge branch 'ux-guide-link-update-contributing' into 'master' Achilleas Pipinellis2016-11-161-4/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UX Guide link on Contributing.md Current link on the CONTRIBUTING.md page was to the old UI Guide. This should be updated to the new link. See merge request !7493
| * | | | | | | | | | [ci skip] Fix UX Guide link on Contributing.mdux-guide-link-update-contributingawhildy2016-11-151-4/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master' Dmitriy Zaporozhets2016-11-163-34/+16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move 'Explore Snippets' Spinach feature to Rspec ## What does this MR do? It moves the `features/snippets/discover.feature` Spinach test to a Rspec feature. ## Are there points in the code the reviewer needs to double check? The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use. ## Why was this MR needed? As part of deprecating the Spinach test suite. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [-] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23036 See merge request !7349
| * | | | | | | | | | | Move 'Explore Snippets' Spinach feature to Rspecthe-undefined2016-11-083-34/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the `snippets/discover.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
* | | | | | | | | | | | Merge branch 'fix-merge-request-screen-deleted-source-branch' into 'master' Sean McGivern2016-11-163-9/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not create a MergeRequestDiff record when source branch is deleted Fixes #23413 Fixes #23897 See merge request !7481
| * | | | | | | | | | | | Do not create a MergeRequestDiff record when source branch is deletedfix-merge-request-screen-deleted-source-branchAdam Niedzielski2016-11-163-9/+26
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to have a valid MergeRequestDiff record when need head_commit_sha. When a source branch is deleted head_commit_sha is nil. This causes an exception in merge request "Changes" tab.
* | | | | | | | | | | | Merge branch 'rs-issue-24527' into 'master' Sean McGivern2016-11-163-25/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit labels returned for a specific project as an administrator Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24527 See merge request !7496
| * | | | | | | | | | | | Limit labels returned for a specific project as an administratorRobert Speicher2016-11-163-25/+41
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, an administrator viewing a project's Labels page would see _all_ labels from every project they had access to, rather than only the labels of that specific project (if any). This was not an information disclosure, as admins have access to everything, but it was a performance issue.
* | | | | | | | | | | | Merge branch 'setter-for-key' into 'master' Dmitriy Zaporozhets2016-11-163-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use setter for key instead AR callback ## What does this MR do? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - n/a [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - n/a API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6763 See merge request !7488
| * | | | | | | | | | | Remove instance vars from key model testsSemyon Pupkov2016-11-161-6/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Use setter for key instead AR callbackSemyon Pupkov2016-11-163-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6763
* | | | | | | | | | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-163-9/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix labels API adding missing parameter (current_user) See merge request !7458
| * | | | | | | | | | | | add testsFrancesco Coda Zabetta2016-11-151-6/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | use Enumerable#find insted of select + firstFrancesco Coda Zabetta2016-11-151-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix changelog typosFrancesco Coda Zabetta2016-11-141-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix styleFrancesco Coda Zabetta2016-11-141-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix styleFrancesco Coda Zabetta2016-11-141-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix indentationFrancesco Coda Zabetta2016-11-141-7/+7
| | | | | | | | | | | | |