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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Create guest users only when necessary rather than for every specrs-overcreating-users	Robert Speicher	2017-07-21	2	-12/+24
\| \| \| \| \| \|	These are two examples of a top-level `before` block doing too much. Only specific specs cared about these guest users, but we were creating them and their `ProjectMember` records for every single spec that ran.
*	Merge branch 'gitaly-tree-entries' into 'master'	Rémy Coutable	2017-07-21	2	-8/+47
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate CommitService.GetTreeEntries Gitaly call Closes gitaly#372 See merge request !12941
\| *	Incorporate CommitService.GetTreeEntries Gitaly callgitaly-tree-entries	Alejandro Rodríguez	2017-07-20	2	-8/+47
\| \|
* \|	Merge branch '34549-extract-devise-mappings-into-helper' into 'master'	Rémy Coutable	2017-07-21	5	-6/+28
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper Closes #34549 See merge request !12742
\| * \|	Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test ↵	Jacopo	2017-07-20	5	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	helper Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]` in our tests into the helper method `set_devise_mapping`
* \| \|	Merge branch 'rs-move-mr-slash-command-spec-from-issues' into 'master'	Rémy Coutable	2017-07-21	2	-26/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move a spec related to merge requests out of a feature related to issues See merge request !13002
\| * \| \|	Move a spec related to merge requests out of a feature related to issuesrs-move-mr-slash-command-spec-from-issues	Robert Speicher	2017-07-20	2	-26/+18
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'	Robert Speicher	2017-07-21	1	-50/+66
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Commit.find_all to Gitaly Closes gitaly#396 See merge request !12934
\| * \| \|	Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitaly	Ahmad Sherif	2017-07-20	1	-50/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#396
* \| \| \|	Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' ↵	Robert Speicher	2017-07-21	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Recommend V4 API usage on chat slash command integrations Closes #28975 See merge request !12954
\| * \| \| \|	Recommend using V4 API on chat slash command integrations28975-recommend-using-v4-api-on-slash-command-integrations	Oswaldo Ferreira	2017-07-19	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Robert Speicher	2017-07-21	1	-13/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified' into 'master' Improve version handling on component install tasks Closes #34788 See merge request !13006
\| * \| \| \| \|	Improve version handling on component install tasks34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified	Alejandro Rodríguez	2017-07-20	1	-13/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes an issue where, when using branch versions, the component wouldn't be updated after the first branch checkout. We also save one step, since checking out the FETCH_HEAD with `-f` already does what `reset --hard` did.
* \| \| \| \| \|	Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'	Sean McGivern	2017-07-21	1	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an infinite loop in Gitlab:UntrustedRegexp See merge request !2146
* \| \| \| \| \|	Merge branch '31031-convert-protected-branches-es6' into 'master'	Filipa Lacerda	2017-07-21	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert Protected Branches feature JS code to ES6 See merge request !12970
\| * \| \| \| \| \|	Use JS class for selector	kushalpandya	2017-07-19	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/sm/32790-pipeline_schedules-pages-throwing-error-500' into ↵	Grzegorz Bizon	2017-07-21	1	-0/+24
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Follow-up from "Resolve "pipeline_schedules pages throwing error 500"" Closes #35345, #32790, and #34652 See merge request !12983
\| * \| \| \| \| \|	Add present?	Shinya Maeda	2017-07-20	1	-0/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' ↵	Grzegorz Bizon	2017-07-20	1	-5/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add coordinator url to admin area runner page Closes #20817 See merge request !11603
\| * \| \| \| \| \|	Add #registration_token for %code20817-please-add-coordinator-url-to-admin-area-runner-page	Shinya Maeda	2017-07-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add an id for the tag(#registration_token). Wrap long lines.	Shinya Maeda	2017-07-20	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix spec	Shinya Maeda	2017-07-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add coordinator url to admin area runner page	Shinya Maeda	2017-07-20	1	-4/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use partial and shring same UI Swap two. Like the project runner section. Fix tests
* \| \| \| \| \|	Refactor filtered search dropdown parameters	Clement Ho	2017-07-20	1	-2/+7
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Wrong data type when testing webhooks	Alexander Randa	2017-07-20	17	-41/+374
\| \| \| \| \|
* \| \| \| \|	Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'	Robert Speicher	2017-07-20	2	-3/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate DiffCollection limiting logic to Gitaly See merge request !12867
\| * \| \| \| \|	Migrate DiffCollection limiting logic to Gitalyfeature/send-diff-limits-to-gitaly	Ahmad Sherif	2017-07-19	2	-3/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'	Kamil Trzciński	2017-07-20	3	-0/+81
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix docker tag reference routing constraints Closes #35220 and gitlab-com/support-forum#2246 See merge request !12961
\| * \| \| \| \| \|	Add a test for container repository name regexp	Grzegorz Bizon	2017-07-19	1	-0/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix docker tag reference routing constraints	Grzegorz Bizon	2017-07-19	2	-0/+70
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'feature/gb/auto-retry-failed-ci-job' into 'master'	Kamil Trzciński	2017-07-20	6	-1/+181
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it possible to auto retry a failed CI/CD job Closes #3442 See merge request !12909
\| * \| \| \| \| \| \|	Change auto-retry count to a correct value in docs	Grzegorz Bizon	2017-07-20	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix CI/CD job auto-retry specsfeature/gb/auto-retry-failed-ci-job	Grzegorz Bizon	2017-07-20	2	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Do not allow to auto-retry a job more than 2 times	Grzegorz Bizon	2017-07-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add specs for pipeline process with auto-retries	Grzegorz Bizon	2017-07-17	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also resolve a possible race condition - a next stage should not start until are retries are done in a previous one.
\| * \| \| \| \| \| \|	Add specs seeding jobs with auto-retries configured	Grzegorz Bizon	2017-07-17	1	-0/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make it possible to auto retry a failed CI/CD job	Grzegorz Bizon	2017-07-17	1	-1/+32
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make it possible to count a number of job retries	Grzegorz Bizon	2017-07-17	2	-0/+45
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a new `retry` CI/CD configuration keyword	Grzegorz Bizon	2017-07-17	2	-0/+61
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into ↵	Yorick Peterse	2017-07-20	2	-3/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Implement build stage_id reference migration clean up Closes #34893 See merge request !12785
\| * \| \| \| \| \| \| \|	Fix background migration cleanup specs	Grzegorz Bizon	2017-07-20	1	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to use a spy because an `after` RSpec hook is also going to call the migration we want to test, so we need to use `have_received` expectation. See gitlab-org/gitlab-ce#35351 for more details.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into backstage/gb/build-stage-id-ref-bg-migration-cleanupbackstage/gb/build-stage-id-ref-bg-migration-cleanup	Grzegorz Bizon	2017-07-19	37	-79/+482
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (59 commits) Resolve "Clarify k8s service keys" Add Portuguese Brazil translations of Commits Page & Pipeline Charts Add Japanese Translation to i18n Update Prometheus gem to version that explicitly calls `munmap` Simplify width for dropdown-menu on mobile Update CHANGELOG.md for 9.3.7 Remove developer documentation about not describing symbols Incorporate Gitaly's Commits#between RPC Adapt to new Gitaly commit message format Remove transitions on nav link hover Provide option to trigger build only for official CE and EE repos in .com Fix queries duration sorting in Performance Bar Rename Project nav items Add structured logging for Rails processes Disable Rails logging in CI test environments Fix download artifacts button alignment Update avatar border to be opaque for better stacking Fixed typos Fix typos Fix external issue trackers redirect ... Conflicts: db/schema.rb
\| * \| \| \| \| \| \| \|	Isolate stage_id reference clean up migration	Grzegorz Bizon	2017-07-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This addreses a review remarks discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12785/diffs#note_35276344
\| * \| \| \| \| \| \| \|	Fix background migrations module specs	Grzegorz Bizon	2017-07-18	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove migration dependency from stage_id migration	Grzegorz Bizon	2017-07-18	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add specs for stage_id reference cleanup migration	Grzegorz Bizon	2017-07-18	1	-11/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add pending set of specs for stage_id cleanup migration	Grzegorz Bizon	2017-07-18	1	-0/+22
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '35253-desc-protected-branches-for-non-member' into 'master'	Rémy Coutable	2017-07-20	1	-1/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide description about protected branches to non-member Closes #35253 See merge request !12945
\| * \| \| \| \| \| \|	Hide description about protected branches to non-member	Takuya Noguchi	2017-07-20	1	-1/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'	Douwe Maan	2017-07-19	4	-0/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	24570 use re2 for user supplied regexp 9 3 See merge request !2129