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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add CHANGELOG entryfix/git-access-wiki-when-repository-feature-disabled	Douglas Barbosa Alexandre	2016-11-30	1	-0/+4
\|
*	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
\|
*	Allow access to the wiki with git when repository feature disabled	Douglas Barbosa Alexandre	2016-11-30	3	-1/+16
\|
*	Merge branch 'api-branch-status' into 'master'	Rémy Coutable	2016-11-30	4	-1/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-1/+25
\| \|
* \|	Merge branch 'revert-rufus-scheduler-bump' into 'master'	Stan Hu	2016-11-30	1	-2/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert bump in rufus-scheduler Somehow `bundle install` with an update to Sidekiq-cron in !7815 caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160 See merge request !7844
\| * \|	Revert bump in rufus-schedulerrevert-rufus-scheduler-bump	Stan Hu	2016-11-30	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Somehow `bundle install` with an update to Sidekiq-cron caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160
* \| \|	Merge branch 'dont-run-ee_compat_check-on-dev' into 'master'	Sean McGivern	2016-11-30	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable the `ee_compat_check` task on dev See merge request !7847
\| * \| \|	Disable the ee_compat_check task on dev	Rémy Coutable	2016-11-30	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We usually use it for security fixes that don't need to be ported to EE and the task seems to hang when run against the security branch. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'fix-migrations' into 'master'	Sean McGivern	2016-11-30	22	-3/+47
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Make the `downtime_check` task happy See merge request !7845
\| * \| \|	Make the downtime_check task happyfix-migrations	Rémy Coutable	2016-11-30	22	-3/+47
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'grapify-files-api' into 'master'	Rémy Coutable	2016-11-30	2	-95/+62
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
\| * \|	Grapify the files APIgrapify-files-api	Robert Schilling	2016-11-30	2	-95/+62
\| \|/
* \|	Merge branch 'grapify-projects-api' into 'master'	Rémy Coutable	2016-11-30	4	-358/+288
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the projects API Related to #22928 See merge request !7456
\| * \|	Grapify the projects APIgrapify-projects-api	Robert Schilling	2016-11-28	4	-358/+288
\| \| \|
* \| \|	Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master'	Rémy Coutable	2016-11-30	3	-1/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-95/+108
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-21/+52
\| \| \| \| \| \|
\| * \| \| \| \|	Add Changelog entry for pipeline creation improvements	Grzegorz Bizon	2016-11-25	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	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
\| \| \| \| \| \|
\| * \| \| \| \|	Create pipeline along with builds in the transation	Grzegorz Bizon	2016-11-24	2	-12/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/rename-merge-request-head-pipeline' into 'master'	Kamil Trzciński	2016-11-30	12	-39/+56
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	12	-39/+56
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Sean McGivern	2016-11-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite an HTTP link to use HTTPS See merge request !7834
\| * \| \| \| \| \| \|	Rewrite an HTTP link to use HTTPS	Alex Jordan	2016-11-29	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/ca-no-date' into 'master'	Douwe Maan	2016-11-30	5	-6/+68
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/fix/ca-no-date' into fix/ca-no-datefix/ca-no-date	James Lopez	2016-11-29	1	-4/+9
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Show dashes when date is empty	Alfredo Sumaran	2016-11-28	1	-4/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix started_at check	James Lopez	2016-11-29	1	-5/+1
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	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	3	-3/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add changelog entry	James Lopez	2016-11-25	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix for builds with no start date and spec	James Lopez	2016-11-25	2	-1/+32
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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 'add-stackprof' into 'master'	Robert Speicher	2016-11-30	4	-0/+130
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add StackProf to the Gemfile, along with a utility to get a profile for a spec The test suite needs speeding up significantly. This is one tool for investigating it. Related to #23034 See merge request !7784
\| * \| \| \| \| \| \| \| \|	Add StackProf to the Gemfile, along with a utility to get a profile for a spec	Nick Thomas	2016-11-29	4	-0/+130
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-update-sidekiq-cron' into 'master'	Robert Speicher	2016-11-30	3	-5/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface: https://github.com/ondrejbartas/sidekiq-cron/commit/88ada926132d4658e3fd370c9f44899b6c88ccaf Closes #24376 See merge request !7815
\| * \| \| \| \| \| \| \| \|	Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1sh-update-sidekiq-cron	Stan Hu	2016-11-29	3	-5/+10
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface. Closes #24376
* \| \| \| \| \| \| \| \|	Merge branch '23666-set-null-true-for-timestamps-columns-in-migrations' into ↵	Robert Speicher	2016-11-30	23	-24/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add `null: true` to timestamps in migrations that does not define it This is to ensure that migrations will still be consitent when we will upgrade to Rails 5 which default to `null: false` for timestamps columns. Fixes #23666. See merge request !7791
\| * \| \| \| \| \| \| \| \|	Add `null: true` to timestamps in migrations that does not define it23666-set-null-true-for-timestamps-columns-in-migrations	Rémy Coutable	2016-11-28	23	-24/+24
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to ensure that migrations will still be consitent when we will upgrade to Rails 5 which default to `null: false` for timestamps columns. Fixes #23666. Signed-off-by: Rémy Coutable <remy@rymai.me>