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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix Rubocop offenses in environments specs29943-environment-folder	Grzegorz Bizon	2017-08-18	1	-2/+1
\|
*	Implement method that returns environment's folder	Grzegorz Bizon	2017-08-18	4	-11/+32
\| \| \| \| \| \|	`Environment#folder_name` method returns a folder name that holds the environment. If it is a top-level environment it will return environment name, folder name otherwise.
*	Add missing specs for expandable environment folders	Grzegorz Bizon	2017-08-18	2	-1/+27
\|
*	Refactor environments spec and remove mystery guests	Grzegorz Bizon	2017-08-18	1	-94/+87
\|
*	Adds folder_path to frontend	Filipa Lacerda	2017-08-18	5	-18/+18
\|
*	Merge branch 'fly-out-nav-collapsed' into 'master'	Annabel Dunstone Gray	2017-08-09	3	-9/+78
\| \| \| \| \|	Fix fly-out navigation not showing for active items in collapsed sidebar See merge request !13353
*	Merge branch 'gitaly-bundle-gemfile' into 'master'	Rémy Coutable	2017-08-09	2	-2/+2
\| \| \| \| \|	Unset BUNDLE_GEMFILE when installing Gitaly See merge request !13378
*	Merge branch '36168-fix-transient-preferences-specs' into 'master'	Sean McGivern	2017-08-09	1	-12/+16
\| \| \| \| \|	Fix Profile > Preferences feature specs See merge request !13382
*	Merge branch 'fly-out-min-width' into 'master'	Annabel Dunstone Gray	2017-08-09	1	-1/+1
\| \| \| \| \|	Fix fly-out width when it has long items See merge request !13371
*	Merge branch '35098-raise-encoding-confidence-threshold' into 'master'	Sean McGivern	2017-08-09	5	-1/+102
\| \| \| \| \| \| \|	Raise encoding confidence threshold to 50 Closes #35098 See merge request !12990
*	Merge branch '36169-fix-master' into 'master'	Sean McGivern	2017-08-09	1	-13/+8
\| \| \| \| \|	Fix a broken Events API spec See merge request !13381
*	Merge branch 'remove-repo-editor-feature-flag' into 'master'	Jacob Schatz	2017-08-09	4	-27/+4
\| \| \| \| \|	Remove repo editor feature flag from RC1 See merge request !13379
*	Merge branch 'rc/fix-commits-api' into 'master'	Sean McGivern	2017-08-08	10	-173/+592
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
\| *	Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-api	Rémy Coutable	2017-08-08	10	-173/+592
\| \| \| \| \| \| \| \| \| \| \| \|	name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'project-homepage-activity' into 'master'	Tim Zallmann	2017-08-08	2	-0/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed activity not loading on project homepage See merge request !13373
\| * \|	Fixed activity not loading on project homepageproject-homepage-activity	Phil Hughes	2017-08-08	2	-0/+16
\| \| \|
* \| \|	Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master'	Clement Ho	2017-08-08	3	-21/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bar chart does not display label at hour 0 Closes #35136 See merge request !13330
\| * \| \|	Fix bar chart does not display label at hour 0	Jason Dai	2017-08-08	3	-21/+23
\|/ / /
* \| \|	Merge branch 'winh-scope-haml-linter' into 'master'	Grzegorz Bizon	2017-08-08	1	-9/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict InlineJavaScript for haml_lint to dev and test environment Closes omnibus-gitlab#2658 See merge request !13364
\| * \| \|	Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linter	winh	2017-08-08	1	-9/+11
\| \| \| \|
* \| \| \|	Merge branch 'project_events_noteable_iid' into 'master'	Rémy Coutable	2017-08-08	5	-3/+90
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose noteable_iid in Note See merge request !13265
\| * \| \| \|	Expose noteable_iid in Note	sue445	2017-08-08	5	-3/+90
\|/ / / /
* \| \| \|	Merge branch 'rc/fix-tags-api' into 'master'	Sean McGivern	2017-08-08	9	-184/+388
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name… See merge request !13368
\| * \| \|	Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵	Rémy Coutable	2017-08-08	9	-184/+388
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵	Rémy Coutable	2017-08-08	3	-18/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313
\| * \| \|	Print the setup steps and duration and fix an issue resulting in re-setuping ↵35941-fix-testing-issue-following-gitaly-install-fix	Rémy Coutable	2017-08-04	3	-9/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Shell on each test run Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Unset the RUBYOPT env variable before installing gitaly-ruby	Rémy Coutable	2017-08-04	3	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Revert "Merge branch 'fix-gitaly-install' into 'master'"	Rémy Coutable	2017-08-04	3	-17/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 23c502b43404aa70741462da5d57c23196f6088a, reversing changes made to 1018ab0516fd94d1ffbc05a0ad8499947dd9630d.
* \| \| \|	Merge branch '35002_add_italian_translations_of_pipeline_schedules' into ↵	Rémy Coutable	2017-08-08	1	-3/+27
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add Italian translations of Pipeline Schedules Closes #35002 See merge request !12981
\| * \| \|	Add Italian translations of Pipeline Schedules	Huang Tao	2017-08-08	1	-3/+27
\|/ / /
* \| \|	Merge branch 'document-and-test-api-iids' into 'master'	Rémy Coutable	2017-08-08	4	-8/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the iids parameters in the API documentation See merge request !13340
\| * \| \|	Fix the iids parameters in the API documentation	Frank Pavageau	2017-08-07	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the parameter name is really `iids[]`, it should be used consistently across the documentation.
* \| \| \|	Merge branch 'ide' into 'master'	Mike Greiling	2017-08-08	101	-239/+3706
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Multi-File Editor Using Monaco/VSCode Closes #31890 See merge request !12198
\| * \ \ \	Merge branch 'master' into ide	Mike Greiling	2017-08-07	204	-4690/+3960
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
* \| \| \| \|	Merge branch '24685_view_self' into 'master'	Jacob Schatz	2017-08-08	6	-22/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show all labels See merge request !13303
\| * \| \| \| \|	Show all labels	Regis Boudinot	2017-08-08	6	-22/+35
\|/ / / / /
* \| \| \| \|	Merge branch '31207-clean-locked-merge-requests' into 'master'	Stan Hu	2017-08-08	29	-55/+196
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
\| * \| \| \| \|	Exclude merge_jid on Import/Export attribute configuration	Oswaldo Ferreira	2017-08-07	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Re-add column locked_at on migration rollback31207-clean-locked-merge-requests	Oswaldo Ferreira	2017-08-07	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Move locked_at removal to post-deployment migration	Oswaldo Ferreira	2017-08-07	3	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Store MergeWorker JID on merge request, and clean up stuck merges	Oswaldo Ferreira	2017-08-07	28	-54/+193
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '33874_confi' into 'master'	Jacob Schatz	2017-08-07	14	-28/+434
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	33874 confidential issue redesign See merge request !12801
\| * \| \| \| \| \|	33874 confidential issue redesign	Regis Boudinot	2017-08-07	14	-28/+434
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Clement Ho	2017-08-07	4	-3/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-master' into 'master' Resolve "User dropdown in filtered search does not load avatar on `master`" Closes #35729 See merge request !13181
\| * \| \| \| \| \|	Resolve "User dropdown in filtered search does not load avatar on `master`"	Tim Zallmann	2017-08-07	4	-3/+7
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'	Robert Speicher	2017-08-07	3	-20/+63
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268
\| * \| \| \| \| \|	Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitaly	Ahmad Sherif	2017-08-07	6	-24/+67
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#443
* \| \| \| \| \|	Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'	Robert Speicher	2017-08-07	5	-5/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
\| * \| \| \| \| \|	Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitaly	Ahmad Sherif	2017-08-07	5	-5/+25
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#437
* \| \| \| \| \|	Merge branch '32844-issuables-performance' into 'master'	Sean McGivern	2017-08-07	14	-14/+198
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuables: Move some code from create services to Sidekiq workers See merge request !13326