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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '_acet-fix-outdated-discussions' into 'master'	Tim Zallmann	2018-07-18	5	-0/+69
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix showing outdated discussions on Changes tab. Closes #48167 See merge request gitlab-org/gitlab-ce!20445
\| *	Fix showing outdated discussions on Changes tab_acet-fix-outdated-discussions	Fatih Acet	2018-07-18	5	-0/+69
\| \|
* \|	Merge branch '45318-FE-junit-tests' into 'master'	Phil Hughes	2018-07-18	5	-0/+327
\|\ \ \| \|/ \|/\| \| \| \| \|	Backports security reusable components into CE to use in JUnit report See merge request gitlab-org/gitlab-ce!20613
\| *	Removes commented code45318-FE-junit-tests	Filipa Lacerda	2018-07-17	1	-17/+0
\| \|
\| *	[ci skip] Merge branch 'master' into 45318-FE-junit-tests	Filipa Lacerda	2018-07-16	8	-74/+136
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (49 commits) Add changelog entry Fix `transform` typo Fix archived parameter for projects API Enable frozen string in apps/uploaders/*.rb Fix invalid link to GitLab.com architecture.md i18n: externalize strings from 'app/views/import' Remove Repository#lookup and unreachable rugged code refactor code based on feedback Trigger rails5 tests either by variable or ref name Fix link in help doc which was linking to old mono-repo, now in its own repo SubmoduleHelper - Project is not always available as an instance variable Allow Danger step to fail update webpack to v4.16 Backport logger changes from EE Add the CI Job trigger as the build trigger Remove flaky and redundant expectations use fileuploader dynamic path method in uploads manager and add spec fix typo in uploads manager add small comment to download method in uploads manager refactor uploads manager ...
\| * \|	Backports security reports reusable components into CE code base	Filipa Lacerda	2018-07-13	5	-0/+344
\| \| \|
* \| \|	Resolve "Metrics drop down doesn't show all environment, some not clickable"	Jose Ivan Vargas	2018-07-17	2	-1/+23
\| \| \|
* \| \|	Resolve "MR: Reduce the memory footprint of the component tree"	Tim Zallmann	2018-07-17	4	-3/+22
\| \|/ \|/\|
* \|	Merge branch '49291-fix-memory-graph-component-typo' into 'master'	Filipa Lacerda	2018-07-16	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in CSS transform property for Memory Graph component Closes #49291 See merge request gitlab-org/gitlab-ce!20650
\| * \|	Fix `transform` typo	Kushal Pandya	2018-07-16	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'	Kamil Trzciński	2018-07-16	2	-7/+7
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it more explicit what environment stop actions are Closes #48672 See merge request gitlab-org/gitlab-ce!20587
\| * \|	Rename environments stop action method	Grzegorz Bizon	2018-07-12	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it more explicit that an environment is not a stop action, but instead is merely contains a stop action.
* \| \|	Merge branch '49128-improve-log-output-of-jasmine-toequal' into 'master'	Mike Greiling	2018-07-13	1	-1/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve log output of jasmine `toEqual` diffs" Closes #49128 See merge request gitlab-org/gitlab-ce!20557
\| * \| \|	improve log output of jasmine `toEqual` with nested objects/arrays49128-improve-log-output-of-jasmine-toequal	Lukas Eipert	2018-07-11	1	-1/+10
\| \| \| \|
* \| \| \|	Merge branch '48673-lazy-load-performance-bar-in-frontend' into 'master'	Mike Greiling	2018-07-13	2	-60/+84
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Lazy-load performance bar in frontend" Closes #48673 See merge request gitlab-org/gitlab-ce!20607
\| * \| \| \|	Lazy-load performance bar UI48673-lazy-load-performance-bar-in-frontend	Sean McGivern	2018-07-13	2	-60/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to eagerly load the performance bar wrapper component (`performance_bar/index.js`) when the page is loaded and the container element is present, to ensure that we register the interceptor early enough in the page's lifecycle. However, we don't need to load the UI at that point. Not doing so means that we can let Webpack extract the UI (`performance_bar/components/*`) into its own chunk, so users who don't see the performance bar don't have to load too much unnecessary JavaScript.
* \| \| \| \|	Merge branch 'ide-merge-requests-forks' into 'master'	Filipa Lacerda	2018-07-13	2	-5/+34
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow merge requests from forks to be opened in Web IDE Closes #47460 See merge request gitlab-org/gitlab-ce!20521
\| * \| \| \|	fixed test to correctly text relative URLside-merge-requests-forks	Phil Hughes	2018-07-13	1	-7/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doesnt add query param if source & target projects match
\| * \| \| \|	fixed karma specs	Phil Hughes	2018-07-12	1	-2/+9
\| \| \| \| \|
\| * \| \| \|	Allow merge requests from forks to be opened in Web IDE	Phil Hughes	2018-07-12	1	-0/+2
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #47460
* \| \| \|	Merge branch 'ide-pipeline-icon-open' into 'master'	Filipa Lacerda	2018-07-13	2	-0/+29
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open pipeline list panel when clicking CI icon in Web IDE Closes #47843 See merge request gitlab-org/gitlab-ce!20516
\| * \| \|	Open pipeline list panel when clicking CI icon in Web IDEide-pipeline-icon-open	Phil Hughes	2018-07-10	2	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #47843
* \| \| \|	Merge branch '48912-vue-files-without-tests-missing-in-coverage-report' into ↵	Annabel Gray	2018-07-12	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Include Vue files without tests in coverage report Closes #48912 See merge request gitlab-org/gitlab-ce!20431
\| * \| \| \|	Include Vue files that are not covered by tests in test coverage48912-vue-files-without-tests-missing-in-coverage-report	Winnie Hellmann	2018-07-12	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Vuex test helper improvements	Lukas Eipert	2018-07-12	8	-86/+231
\|/ / /
* \| \|	Merge branch 'ide-row-dropdown-design-update' into 'master'	Filipa Lacerda	2018-07-12	4	-64/+70
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to new entry dropdowns in Web IDE Closes #44845 See merge request gitlab-org/gitlab-ce!20526
\| * \| \|	Improvements to new entry dropdowns in Web IDE	Phil Hughes	2018-07-11	4	-64/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44845
* \| \| \|	Remove timeouts from TimeTracker tests	Winnie Hellmann	2018-07-12	2	-201/+243
\| \| \| \|
* \| \| \|	Revert "Merge branch 'ee-5481-epic-todos' into 'master'"	Jarka Kadlecová	2018-07-11	1	-158/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* \| \| \|	Merge branch '48237-toggle-file-comments' into 'master'	Phil Hughes	2018-07-11	5	-70/+268
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
\| * \| \|	Adds specs for toggleFileDiscussions action	Filipa Lacerda	2018-07-11	1	-0/+44
\| \| \| \|
\| * \| \|	Adds specs for getters in merge request vuex diff module	Filipa Lacerda	2018-07-11	2	-94/+30
\| \| \| \|
\| * \| \|	Merge branch 'master' into 48237-toggle-file-comments	Filipa Lacerda	2018-07-10	7	-125/+340
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...
* \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Backend	Mark Chao	2018-07-11	3	-3/+3
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Mock timeouts and Promise in SmartInterval tests	Winnie Hellmann	2018-07-10	3	-99/+130
\| \|/ / \|/\| \|
* \| \|	Support manually stopping any environment from the UI	Winnie Hellmann	2018-07-10	2	-12/+4
\| \| \|
* \| \|	Merge branch '48951-clean-up' into 'master'	Phil Hughes	2018-07-10	1	-43/+48
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "MR refactor: All actions under diff module are being exported twice" Closes #48951 See merge request gitlab-org/gitlab-ce!20499
\| * \|	Removes unused store in diffs mr refactor	Filipa Lacerda	2018-07-09	1	-43/+48
\| \|/ \| \| \| \| \| \|	Removes double export for actions in diffs module in mr refactor
* \|	Call correct action in spec	Filipa Lacerda	2018-07-09	1	-1/+1
\|/
*	Resolve "MR refactor: Performance costs of main element with `v-if`"	Tim Zallmann	2018-07-09	1	-2/+2
\|
*	Redesign for mr widget info and pipelines section	Clement Ho	2018-07-06	2	-5/+5
\|
*	Use proper markdown rendering for previews	Brett Walker	2018-07-06	1	-0/+1
\|
*	Merge branch 'fl-mr-refactor-performance-improvements' into 'master'	Tim Zallmann	2018-07-06	1	-5/+47
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improves MR refactor getters and state and adds specs Closes #48937 See merge request gitlab-org/gitlab-ce!20429
\| *	Exports getters individually.	Filipa Lacerda	2018-07-06	1	-5/+47
\| \| \| \| \| \| \| \| \| \|	Exports state to allow tests Adds specs for the getters that didn't have any.
* \|	(Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"	Luke Bennett	2018-07-06	1	-0/+69
\| \|
* \|	Resolve "Add dropdown to Groups link in top bar"	Dennis Tang	2018-07-06	16	-939/+1051
\| \|
* \|	Merge branch 'ide-merge-request-info' into 'master'	Sean McGivern	2018-07-06	3	-1/+126
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added merge request info to Web IDE sidebar Closes #45187 See merge request gitlab-org/gitlab-ce!19860
\| * \|	component spec	Phil Hughes	2018-07-05	2	-0/+123
\| \| \|
\| * \|	karma & rubocop fixes	Phil Hughes	2018-07-05	1	-1/+3
\| \|/
* \|	Resolve "MRs are showing some discussions as unresolved"	Simon Knox	2018-07-05	5	-10/+39
\|/