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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists	Jacopo	2016-12-02	2	-0/+58
\| \| \| \| \| \| \|	When ldap is enabled and use "Standard" authentication method, if authentication fails the correct tab remain selected. This is done by saving into localStorage when the active tab changes and by always selecting that tab when the page is loaded.
*	Merge branch '23718/backup-rake-task-human-readable' into 'master'	Douwe Maan	2016-12-01	1	-0/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	23718/backup rake task human readable ## What does this MR do? Add the human readable format to the backup tar file. From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #23718 issue ## 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 - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] 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? 23718 See merge request !7188
\| *	Add Human Readable Timestamp to backup tar file	David Gerő	2016-11-30	1	-0/+31
\| \|
* \|	Merge branch ↵	Robert Speicher	2016-12-01	7	-6/+209
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install' into 'master' New `gitlab:workhorse:install` rake task ## Why was this MR needed? Because with this we can remove the "Ensure the gitlab-workhorse version in Install gitlab-workhorse matches the required version." step from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1! MR is ready: gitlab-org/release-tools!57 Closes #22719 See merge request !6574
\| * \|	Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install	Rémy Coutable	2016-11-30	8	-63/+58
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Add #run_command! to task helpers to raise a TaskFailedError if status is not 0	Rémy Coutable	2016-11-30	2	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	New `gitlab:workhorse:install` rake task	Rémy Coutable	2016-11-30	3	-0/+208
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'fix/git-access-wiki-when-repository-feature-disabled' into ↵	Sean McGivern	2016-11-30	2	-2/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fixes access to the wiki code with git when repository feature disabled ## What does this MR do? Allow access to the wiki repository with git when the repository feature is disabled. ## Why was this MR needed? Without this fix, if you create a wiki only project you are not allowed to download the wiki code from this project. ## 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 - [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) - [ ] 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 #24931 See merge request !7832
\| * \| \|	Improve Gitlab::GitAccessWiki spec with download access checks	Douglas Barbosa Alexandre	2016-11-30	1	-0/+25
\| \| \| \|
\| * \| \|	Improve ProjectPolicy spec to check permissions when wiki is disabled	Douglas Barbosa Alexandre	2016-11-30	1	-2/+12
\| \| \| \|
* \| \| \|	Merge branch '24844-environments-date' into 'master'	Fatih Acet	2016-11-30	1	-0/+14
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Environments displaying incorrect date since 8.14 upgrade" ## What does this MR do? Shows the correct date in the environments table. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Date shown was not the correct one. ## Screenshots (if relevant) ## 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 - [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? Closes #24844 See merge request !7830
\| * \| \|	Fix comma-dangle in function's arguments errors24844-environments-date	Filipa Lacerda	2016-11-30	1	-2/+2
\| \| \| \|
\| * \| \|	Use created date from last_deployment	Filipa Lacerda	2016-11-30	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds test Adds changelog entry
* \| \| \|	Merge branch 'api-branch-status' into 'master'	Rémy Coutable	2016-11-30	1	-0/+11
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
\| * \| \|	API: Expose branch statusapi-branch-status	Robert Schilling	2016-11-30	1	-0/+11
\| \| \| \|
* \| \| \|	Merge branch 'grapify-projects-api' into 'master'	Rémy Coutable	2016-11-30	1	-21/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the projects API Related to #22928 See merge request !7456
\| * \| \| \|	Grapify the projects APIgrapify-projects-api	Robert Schilling	2016-11-28	1	-21/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master'	Rémy Coutable	2016-11-30	1	-0/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not raise error in AutocompleteController#users when not authorized Closes #25031 See merge request !7817
\| * \| \| \| \|	Do not raise error in AutocompleteController#users when not authorized	Semyon Pupkov	2016-11-30	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/25031
* \| \| \| \| \|	Merge branch 'rs-group-security-spec-speed' into 'master'	Rémy Coutable	2016-11-30	4	-219/+181
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up Group security access specs This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7813
\| * \| \| \| \| \|	Speed up Group security access specsrs-group-security-spec-speed	Robert Speicher	2016-11-30	4	-219/+181
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969
* \| \| \| \| \|	Merge branch 'fix/create-pipeline-with-builds-in-transaction' into 'master'	Kamil Trzciński	2016-11-30	2	-84/+81
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create pipeline along with builds in the transation ## What does this MR do? This MR makes it possible to create pipeline along with all associated builds in the transaction, to avoid having empty pipelines when asynchronous job gets terminated. This will simplify implementation of `PipelineUnlockWorker` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6988 and improve reliability of the CI as a whole. ## What are the relevant issue numbers? Related to #24361 See merge request !7742
\| * \| \| \| \| \|	Extend pipelines factory with transient config attributefix/create-pipeline-with-builds-in-transaction	Grzegorz Bizon	2016-11-27	2	-14/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve readability in pipeline test objects factory	Grzegorz Bizon	2016-11-25	1	-6/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove pipeline factory that is not used in tests	Grzegorz Bizon	2016-11-25	1	-6/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Restore method that ensures builds being created	Grzegorz Bizon	2016-11-25	2	-21/+37
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove remaining calls to CI yaml in pipeline specs	Grzegorz Bizon	2016-11-25	1	-5/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move helpers to the end of process pipeline specs	Grzegorz Bizon	2016-11-25	1	-29/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update pipeline processing specs for creating builds	Grzegorz Bizon	2016-11-25	1	-35/+28
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/rename-merge-request-head-pipeline' into 'master'	Kamil Trzciński	2016-11-30	4	-19/+35
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `MergeRequest#pipeline` to `head_pipeline` ## What does this MR do? This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline` ## Does this MR meet the acceptance criteria? - [x] All builds are passing ## What are the relevant issue numbers? Closes #24810 See merge request !7783
\| * \| \| \| \| \|	Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipeline	Grzegorz Bizon	2016-11-29	4	-19/+35
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/ca-no-date' into 'master'	Douwe Maan	2016-11-30	1	-1/+52
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix for builds with no start date throwing an error in cycle analytics events Instead of the error, we should inform that there is no start date - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24925 See merge request !7738
\| * \| \| \| \| \|	fix rubocop warning	James Lopez	2016-11-25	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	use an empty total time when the build has not started yet so the UI knows	James Lopez	2016-11-25	1	-1/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix for builds with no start date and spec	James Lopez	2016-11-25	1	-1/+30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '24772-fix-transient-failing-spec' into 'master'	Sean McGivern	2016-11-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a transient spec failure Closes #24772 See merge request !7825
\| * \| \| \| \| \|	Fix a transient spec failure24772-fix-transient-failing-spec	Rémy Coutable	2016-11-29	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorting by created_at can lead to uncertainties if two records are created at the same time. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into ↵	Douwe Maan	2016-11-30	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE-specific changes for gitlab-org/gitlab-ee#1137 ## What does this MR do? - gitlab-org/gitlab-ee#1137 is a `technical debt` issue to clean up the EE protected branch access levels (for users and groups) implementation. - Some of this cleanup bleeds over to code shared by CE and EE, which is why this MR is required. - An EE-specific MR has also been created: gitlab-org/gitlab-ee!927 See merge request !7821
\| * \| \| \| \| \|	CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groups	Timothy Andrew	2016-11-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Extract all common {push,merge} access level model code into the `ProtectedBranchAccess` module - Use the HTTP verb to define controller specs
* \| \| \| \| \| \|	Merge branch '25002-sentence-case-dashboard-tabs' into 'master'	Annabel Dunstone Gray	2016-11-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes project dashboard tabs to sentence casing Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing. Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png) After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png) Closes #25002 See merge request !7774
\| * \| \| \| \| \| \|	Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac	Ryan Harris	2016-11-29	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-jsx-react-eslint-plugins' into 'master'	Fatih Acet	2016-11-29	6	-24/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove JSX/React eslint plugins. ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## 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 - [ ] 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? See merge request !7470
\| * \| \| \| \| \| \| \|	Remove JSX/React eslint plugins.remove-jsx-react-eslint-plugins	Luke "Jared" Bennett	2016-11-29	6	-24/+24
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change airbnb eslint config package to `eslint-config-airbnb-base` and update plugins. Change `airbnb` to `airbnb-base` for .eslintrc `extends` value. Added changelog entry Made sure all plugins and envs are set Corrected new failing specs
* \| \| \| \| \| \| \|	Expose timestamp in build entity used by serializerfeature/expose-timestimes-in-build-entity	Grzegorz Bizon	2016-11-29	1	-9/+16
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/blob-controller-spec' into 'master'	Sean McGivern	2016-11-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix blob controller spec failure See merge request !7814
\| * \| \| \| \| \| \|	fix blob controller spec failure - updated not to use file-path-fix/blob-controller-spec	James Lopez	2016-11-29	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '24880-configurable-plaintext-emails' into 'master'	Sean McGivern	2016-11-29	1	-0/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add setting to enable/disable HTML emails Closes #24880 See merge request !7749
\| * \| \| \| \| \| \| \|	Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emails	Ruben Davila	2016-11-28	1	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This new global setting will allow admins to specify if HTML emails should be sent or not, this is basically useful when system administrators want to save some disk space by avoiding emails in HTML format and using only the Plain Text version.
* \| \| \| \| \| \| \| \|	Merge branch 'zj-issue-search-slash-command' into 'master'	Kamil Trzciński	2016-11-29	2	-1/+47
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issue search slash command See merge request !7752
\| * \| \| \| \| \| \| \|	Add issue search slash commandzj-issue-search-slash-command	Z.J. van de Weg	2016-11-25	2	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One of many requested in: gitlab-org/gitlab-ce#24768