delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add CHANGELOG entry [ci skip]fix-slack-pipeline-event	Lin Jen-Shin	2016-11-16	1	-0/+4
\|
*	Fix pipeline author for Slack and use pipeline id	Lin Jen-Shin	2016-11-16	2	-6/+5
\| \| \| \|	rather than using SHA for the pipeline link.
*	Merge branch 'ux-guide-link-update-contributing' into 'master'	Achilleas Pipinellis	2016-11-16	1	-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-contributing	awhildy	2016-11-15	1	-4/+2
\| \|
* \|	Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master'	Dmitriy Zaporozhets	2016-11-16	3	-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 Rspec	the-undefined	2016-11-08	3	-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 McGivern	2016-11-16	3	-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-branch	Adam Niedzielski	2016-11-16	3	-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 McGivern	2016-11-16	3	-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 administrator	Robert Speicher	2016-11-16	3	-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 Zaporozhets	2016-11-16	3	-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 tests	Semyon Pupkov	2016-11-16	1	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Use setter for key instead AR callback	Semyon Pupkov	2016-11-16	3	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ref: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6763
* \| \| \| \| \|	Merge branch 'fix_labels_api_adding_missing_parameter' into 'master'	Sean McGivern	2016-11-16	3	-9/+51
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix labels API adding missing parameter (current_user) See merge request !7458
\| * \| \| \| \| \|	add tests	Francesco Coda Zabetta	2016-11-15	1	-6/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	use Enumerable#find insted of select + first	Francesco Coda Zabetta	2016-11-15	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix changelog typos	Francesco Coda Zabetta	2016-11-14	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix style	Francesco Coda Zabetta	2016-11-14	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix style	Francesco Coda Zabetta	2016-11-14	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix indentation	Francesco Coda Zabetta	2016-11-14	1	-7/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add changelog entry	Francesco Coda Zabetta	2016-11-14	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix labels API adding missing parameter (current_user)	Francesco Coda Zabetta	2016-11-14	2	-9/+32
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '24506-fix-timing-out-migration' into 'master'	Yorick Peterse	2016-11-16	1	-23/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a badly-performing migration See merge request !7483
\| * \| \| \| \| \| \|	Fix a badly-performing migration	Nick Thomas	2016-11-15	1	-23/+23
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'move-snippet-search-spinach-test-to-rspec' into 'master'	Dmitriy Zaporozhets	2016-11-16	4	-86/+66
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move 'Search Snippets' Spinach feature to Rspec ## What does this MR do? Moves the Spinach feature `features/snippet_search.feature` to an RSpec feature `spec/features/snippets/search_snippets_spec.rb`. ## Are there points in the code the reviewer needs to double check? The search results page URL was being visited directly in the original Spinach test, using an encoded search query and specific parameters to trigger the snippet searches. I have changed the RSpect feature to fill in the search box on the snippets dashboard page to retrieve results to cover the missing test coverage on the search box and to avoid the feature test from relying on the implementation details of the search URL structure. ## 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 - [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? #23036 See merge request !7494
\| * \| \| \| \| \| \| \|	Move 'Search Snippets' Spinach feature to Rspec	the-undefined	2016-11-16	4	-86/+66
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit moves the `search_snippets.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Remove unused `SharedSearch` module - Add Rspec feature scenarios
* \| \| \| \| \| \| \|	Merge branch 'doc/sentinel' into 'master'	Achilleas Pipinellis	2016-11-16	3	-196/+1169
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved redis sentinel documentation ## What does this MR do? Updates Redis Sentinel documentation (most Omnibus stuff). ## Are there points in the code the reviewer needs to double check? Grammar / Documentation ## Why was this MR needed? After this https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1000 get merged, people will need to follow new instructions. ## Checklist - Documentation follows Sentinel best-practices: - [x] Suggests amount of sentinel nodes - [x] Suggests amount of redis nodes - [x] Suggests quorum value according to recomended amount of sentinel nodes - [x] Describes how to define quorum according to best-practices - [x] Lists ports and firewall checklist - [x] Following Documentation bring us to a working environment - [ ] Documentation is clear and have no gramatical issue ## What are the relevant issue numbers? gitlab-org/omnibus-gitlab#1565 See merge request !6471
\| * \| \| \| \| \| \| \|	Minor edits in Redis HA source install	Achilleas Pipinellis	2016-11-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Remove experimental heading and move note at the top	Achilleas Pipinellis	2016-11-16	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Merge branch 'doc/sentinel' of gitlab.com:gitlab-org/gitlab-ce into doc/sentinel	Achilleas Pipinellis	2016-11-16	3	-330/+1107
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Merge examples of Redis master/slave + Sentinels for source docs	Achilleas Pipinellis	2016-11-16	1	-67/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Add steps to Redis HA source installation	Achilleas Pipinellis	2016-11-16	1	-73/+123
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge examples of Redis master/slave + Sentinels	Achilleas Pipinellis	2016-11-16	1	-107/+37
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Rearrange Redis HA source installations sections	Achilleas Pipinellis	2016-11-16	1	-24/+33
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add clear instructions for the different Redis HA setups	Achilleas Pipinellis	2016-11-16	1	-35/+40
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Refactor Redis HA docs	Achilleas Pipinellis	2016-11-15	1	-233/+314
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Swap HA setups	Achilleas Pipinellis	2016-11-15	2	-42/+45
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add missing link to GH issue	Achilleas Pipinellis	2016-11-11	1	-6/+9
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Rearrange sections in Sentinel docs	Achilleas Pipinellis	2016-11-10	1	-162/+181
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Move some things over	Achilleas Pipinellis	2016-11-10	1	-83/+112
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Move experimental heading at the bottom under changelog	Achilleas Pipinellis	2016-11-10	1	-26/+33
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix typos of Redis sentinel docs	Achilleas Pipinellis	2016-11-10	1	-22/+22
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remade documentation for Redis HA with Omnibus	Gabriel Mazetto	2016-11-10	2	-182/+480
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fixed some documentation and moved Source install specific to other file.	Gabriel Mazetto	2016-11-08	2	-121/+300
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fixed documentation and added redis/sentinel roles instruction	Gabriel Mazetto	2016-11-08	1	-14/+54
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Few more fixes to Sentinel documentation to address MR feedback	Gabriel Mazetto	2016-11-08	1	-7/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Reduce the ammount of lines to disable services and update TOC	Gabriel Mazetto	2016-11-08	1	-9/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Improved Redis HA and Sentinel documentation.	Gabriel Mazetto	2016-11-08	1	-117/+210
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Improved documentation on HA sentinel part and Redis replication ↵	Gabriel Mazetto	2016-11-08	1	-60/+256
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	troubleshooting.
\| \| * \| \| \| \| \| \| \|	Updated password examples and improved omnibus troubleshooting	Gabriel Mazetto	2016-11-08	1	-4/+19
\| \| \| \| \| \| \| \| \| \|