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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use declared_params helper in APIgrapify-declared-params	Robert Schilling	2016-11-14	12	-36/+20
\|
*	Merge branch 'grapify-to-h' into 'master'	Rémy Coutable	2016-11-14	3	-7/+9
\|\ \| \| \| \| \| \| \| \|	Use to_h to convert params to a hash See merge request !7406
\| *	Use #to_h to convert params to a hashgrapify-to-h	Robert Schilling	2016-11-14	3	-7/+9
\| \|
* \|	Merge branch 'master' into 'master'	Rémy Coutable	2016-11-14	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos and grammar errors See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html See merge request !7451
\| * \|	Fix typos and grammar	seongahjo	2016-11-14	1	-2/+2
\| \| \|
* \| \|	Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master'	Kamil Trzciński	2016-11-14	56	-221/+219
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve naming convention in ci configuration module ## What does this MR do? This MR improves the naming convention in CI configuration module to reflect the domain design better. ## What are the relevant issue numbers? Related to #15060 See merge request !7448
\| * \| \|	Fix indentation in CI variables entry class	Grzegorz Bizon	2016-11-14	1	-1/+1
\| \| \| \|
\| * \| \|	Change name of method for setting CI config entries	Grzegorz Bizon	2016-11-14	5	-28/+28
\| \| \| \|
\| * \| \|	Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-config	Grzegorz Bizon	2016-11-14	55	-168/+166
\| \| \| \|
* \| \| \|	Merge branch 'grapify-subscription-api' into 'master'	Rémy Coutable	2016-11-14	1	-23/+14
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380
\| * \| \|	Grapify subscription API	Robert Schilling	2016-11-14	1	-23/+14
\| \| \| \|
* \| \| \|	Merge branch 'fix-help-page-links' into 'master'	Rémy Coutable	2016-11-14	3	-2/+44
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error links in help index page when access it with url `http://gitlab.example.com/help/` which have an extra slash Fixes #24349 See merge request !7396
\| * \| \| \|	fix error links in help page	Fu Xu	2016-11-12	3	-2/+44
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'	Robert Speicher	2016-11-14	2	-1/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only turn on Sidekiq throttling if column exists If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452 See merge request !7446
\| * \| \| \| \|	Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-init	Stan Hu	2016-11-12	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452
* \| \| \| \| \|	Link to correct version of SanitizationFilter API docs for whitelist	Robert Speicher	2016-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'user_filter_auth' into 'master'	Rémy Coutable	2016-11-14	7	-31/+150
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
\| * \| \| \| \| \|	Centralize LDAP config/filter logic	Drew Blessing	2016-11-11	7	-31/+150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously, some logic was in the Devise initializer and it was not honoring the `user_filter`. If a user outside the configured `user_filter` signed in, an account would be created but they would then be denied access. Now that logic is centralized, the filter is honored and users outside the filter are never created.
* \| \| \| \| \| \|	Merge branch 'zj-remove-unneeded-checks' into 'master'	Robert Speicher	2016-11-14	1	-6/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded nil checks See merge request !7437
\| * \| \| \| \| \| \|	Remove unneeded nil checkszj-remove-unneeded-checks	Z.J. van de Weg	2016-11-12	1	-6/+0
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The library we're using, default_value_for, is configured to interpret nil as the default value, being ENABLED. Given the property can't be nil this check is unneeded.
* \| \| \| \| \| \|	Merge branch 'issue_20245' into 'master'	Robert Speicher	2016-11-14	3	-1/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project Visibility level selector not using default values closes #20245 See merge request !7264
\| * \| \| \| \| \| \|	Fix project Visibility level selector not using default valuesissue_20245	Felipe Artur	2016-11-10	3	-1/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'repository-name-emojis' into 'master'	Rémy Coutable	2016-11-14	5	-13/+30
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
\| * \| \| \| \| \| \|	Added ability to put emojis into repository name	Vincent Composieux	2016-11-12	5	-13/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to put emojis into repository name
* \| \| \| \| \| \| \|	Merge branch 'patch-12' into 'master'	Sean McGivern	2016-11-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use single quote for consistency See merge request !7442
\| * \| \| \| \| \| \| \|	use single quote for consistency	Ben Bodenmiller	2016-11-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '22307-pipeline-link-in-builds-view' into 'master'	Kamil Trzciński	2016-11-13	11	-12/+97
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Link from build page to its pipeline" ## What does this MR do? Adds references and links to a build's pipeline within both individual build pages and the build index. ## Are there points in the code the reviewer needs to double check? Nothing springs to mind ## Why was this MR needed? See #22307 ## Screenshots (if relevant) ![Screen_Shot_2016-10-24_at_3.45.39_PM_copy](/uploads/e6e8745a0a39d8b71c007e7df5fbd051/Screen_Shot_2016-10-24_at_3.45.39_PM_copy.png) ![Screen_Shot_2016-10-24_at_3.46.03_PM_copy](/uploads/3e2eb656347751f10bf62891b56ebcc7/Screen_Shot_2016-10-24_at_3.46.03_PM_copy.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [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? Closes #22307 See merge request !7082
\| * \| \| \| \| \| \| \| \|	remove unused class name22307-pipeline-link-in-builds-view	Mike Greiling	2016-11-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add tests for build row templates	Mike Greiling	2016-11-10	2	-0/+56
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	only display link to pipeline in generic build index, not on pipeline show	Mike Greiling	2016-11-10	5	-20/+22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	update generic commit status to correspond with build status template	Mike Greiling	2016-11-10	2	-2/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add missing column header for pipeline builds view	Mike Greiling	2016-11-10	2	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove red color on API pipeline trigger designation	Mike Greiling	2016-11-10	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add CHANGELOG entry for !7082	Mike Greiling	2016-11-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add pipeline column within builds index	Mike Greiling	2016-11-10	2	-0/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add link to build's pipeline within build page header	Mike Greiling	2016-11-10	2	-0/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-update-ci' into 'master'	Kamil Trzciński	2016-11-13	1	-5/+15
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only run builds on master of CE or EE This should reduce builds run by projects still running all pipelines for CE See merge request !6869
\| * \| \| \| \| \| \| \| \|	Also test on dev.gitlab [ci skip]zj-update-ci	Z.J. van de Weg	2016-11-12	1	-1/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Only run builds on master of CE or EE	Z.J. van de Weg	2016-11-12	1	-4/+6
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ux-guide-index' into 'master'	Achilleas Pipinellis	2016-11-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to index.md UX guide in development README.md Fix wrong link to UX docs that introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7142 See merge request !7444
\| * \| \| \| \| \| \| \|	Fix link to index.md in development README.mdux-guide-index	Achilleas Pipinellis	2016-11-12	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch '24202-header-ui-improvements' into 'master'	Fatih Acet	2016-11-12	2	-0/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to hover/active/focus states in header items ## What does this MR do? Adds some improvements to buttons, dropdowns, inputs, etc. in the header area. ## Are there points in the code the reviewer needs to double check? I'm not sure. ## Why was this MR needed? Requested in an issue. ## Screenshots (if relevant) ![caret](/uploads/574135282e4b2e81476fdd6dd6c1c05d/caret.gif)![hover](/uploads/15a3b8a2aa89baf20270be97c452e006/hover.gif) ## 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 - [ ] 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? Closes #24202 This is not complete yet. I'm new to this, so please let me know what all steps do I need to do (tests, changelog, etc.). See merge request !7412
\| * \| \| \| \| \| \| \|	Remove hover state on location badge.	Devesh Khandelwal	2016-11-12	1	-6/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Darken more icons on hover and highlight search form also.	Devesh Khandelwal	2016-11-11	2	-0/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Darken project selection dropdown caret on hover.	Devesh Khandelwal	2016-11-11	1	-0/+4
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'new-note-worker-record-not-found-fix' into 'master'	Sean McGivern	2016-11-12	6	-11/+99
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix record not found error on NewNoteWorker processing Resolves #22678 See merge request !6863
\| * \| \| \| \| \| \| \|	Does not raise error when Note not found when processing NewNoteWorker	Oswaldo Ferreira	2016-11-11	6	-11/+99
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also remove unnecessary param
* \| \| \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Sean McGivern	2016-11-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix Super User spacing See merge request !7433
\| * \| \| \| \| \| \| \|	fix Super User spacing	Ben Bodenmiller	2016-11-12	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'patch-11' into 'master'	Sean McGivern	2016-11-12	1	-5/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update redis server details See merge request !7436