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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed Karma specdeploy-keys-load-async	Phil Hughes	2017-05-04	1	-3/+12
\|
*	Merge branch 'master' into deploy-keys-load-async	Phil Hughes	2017-05-04	50	-386/+2041
\|\
\| *	Merge branch 'tags-sort-default' into 'master'	Robert Speicher	2017-05-04	1	-0/+20
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed tags sort dropdown being empty Closes #31618 See merge request !11055
\| \| *	Moved to a view spectags-sort-default	Phil Hughes	2017-05-04	2	-15/+20
\| \| \|
\| \| *	Fixed tags sort dropdown being empty	Phil Hughes	2017-05-03	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #31618
\| * \|	Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master'	Douwe Maan	2017-05-04	2	-4/+19
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057
\| \| * \|	Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topo	Timothy Andrew	2017-05-04	2	-4/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
\| * \| \|	Pipeline table mini graph dropdown remains open when table is refreshed	Filipa Lacerda	2017-05-04	2	-61/+66
\| \| \| \|
\| * \| \|	Merge branch 'gitlab-shell-compile' into 'master'	Rémy Coutable	2017-05-04	1	-0/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Compile gitlab-shell go executables See merge request !11039
\| \| * \| \|	Compile gitlab-shell go executables	Jacob Vosmaer	2017-05-04	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch '31156-environments-vue-service' into 'master'	Phil Hughes	2017-05-04	3	-46/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove service from actions dropdown, stop button and redeploy button Closes #31156 and #31567 See merge request !11068
\| \| * \ \ \	Merge branch 'master' into 31156-environments-vue-service31156-environments-vue-service	Filipa Lacerda	2017-05-03	14	-44/+695
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (91 commits) Move api lint out of static analysis job Fix project tree saver and fork spec failures Fix lazy error handling of cron parser Use gitlab-workhorse 2.0.0 Revert to real click seeing as that was a bug with only the original branch Fixed issue_sidebar_spec.rb click as true click cannot hit the right element and removed sleep find and match first dropdown before clicking Elaborate on the usage of Spring Note Ghost user and refer to user deletion documentation Fix label creation from issuable for subgroup projects Detect already enabled DeployKeys in EnableDeployKeyService Extract common parts of snippet and blob pages into partial update article date link ldap-ee article from auth index add ldap article and changes from !10299 Fix misaligned buttons in wiki pages Improve pipelines_finder.rb Improve documentation Correct typo in pipelines_spec.rb Avoid using sample ...
\| \| * \| \| \| \|	Remove service from actions dropdown, stop button and redeploy button	Filipa Lacerda	2017-05-03	3	-46/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '12910-uploader-pers-snippet' into 'master'	Sean McGivern	2017-05-04	4	-2/+261
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare uploaders for personal snippets comments See merge request !11022
\| \| * \| \| \| \| \|	Support uploaders for personal snippets comments12910-uploader-pers-snippet	Jarka Kadlecova	2017-05-02	4	-2/+261
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'	Rémy Coutable	2017-05-04	2	-11/+104
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable navigation to Pages config if Pages is disabled Closes #30529 See merge request !11008
\| \| * \| \| \| \| \|	Disable navigation to Pages config if Pages is disabled	Mark Fletcher	2017-05-04	2	-11/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Regards project-level pages config - Nav link is now shown only if Pages is enabled for instance - Navigation to following controllers denied if Pages disabled: * projects/pages_controller * projects/pages_domains_controller - 'disabled' partial removed + Test for pages_controller introduced
\| * \| \| \| \| \| \|	Merge branch 'always-show-latest-pipeline-in-commit-box' into 'master'	Kamil Trzciński	2017-05-04	1	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always show latest pipeline info in commit box Closes #31378 See merge request !11038
\| \| * \| \| \| \| \| \|	Rename latest_pipeline to last_pipelinealways-show-latest-pipeline-in-commit-box	Lin Jen-Shin	2017-05-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As it might be confusing that it's not the same as Pipeline#latest Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11038#note_28677090
\| * \| \| \| \| \| \| \|	Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵	Sean McGivern	2017-05-04	2	-0/+43
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Handle incoming emails from aliases correctly See merge request !11079
\| \| * \| \| \| \| \| \| \|	Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-come	Sean McGivern	2017-05-03	2	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These set the 'actual' destination email in one of the Delivered-To lines, so check those too.
\| * \| \| \| \| \| \| \| \|	Merge branch 'zj-chat-message-pretty-time' into 'master'	Sean McGivern	2017-05-04	1	-9/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert seconds to minutes and hours on chat notifations See merge request !11054
\| \| * \| \| \| \| \| \| \| \|	Convert seconds to minutes and hours on chat notifationszj-chat-message-pretty-time	Z.J. van de Weg	2017-05-04	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the pipeline message, the duration of the pipeline was shown as: > gitlab-org/gitlab-ee: Pipeline #8002259 of master branch by Douwe Maan failed in 8612 seconds But this many seconds only gave me a clue how long the pipeline took, so now this will be shown as something like: 02:20:12 which gives a much better measure of time.
\| * \| \| \| \| \| \| \| \| \|	Allow to create new branch and empty WIP merge request from issue page	Alfredo Sumaran	2017-05-04	9	-65/+273
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '31544-size-of-project-from-api' into 'master'	Rémy Coutable	2017-05-04	1	-0/+14
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Size of project from API" Closes #31544 See merge request !11013
\| \| * \| \| \| \| \| \| \| \|	Expose project statistics on single requests via the API	Mark Fletcher	2017-05-03	1	-0/+14
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ The statistics parameter was already accepted * This commit ensure that it is respected for GET /projects/:id endpoint + Add documentation of the parameter and update the example response for stats
\| * \| \| \| \| \| \| \| \|	Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵	Douwe Maan	2017-05-03	1	-7/+19
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077
\| \| * \| \| \| \| \| \| \| \|	removes the possibility of commit messages having carriage returns	Tiago Botelho	2017-05-03	1	-7/+19
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'	Sean McGivern	2017-05-03	7	-48/+431
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388
\| \| * \| \| \| \| \| \| \| \| \|	Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diff	Douwe Maan	2017-05-03	7	-48/+431
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	versions
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-blob-external-storage' into 'master'	Sean McGivern	2017-05-03	5	-44/+195
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048
\| \| * \| \| \| \| \| \| \| \| \| \|	Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storage	Douwe Maan	2017-05-03	5	-44/+195
\| \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'further-attempt-to-fix-protected_tags_spec' into 'master'	Sean McGivern	2017-05-03	2	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try waiting for previous dropdown to definitly close before going to click See merge request !11070
\| \| * \| \| \| \| \| \| \| \| \| \|	remove debug codefurther-attempt-to-fix-protected_tags_spec	Luke "Jared" Bennett	2017-05-03	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Try waiting for previous dropdown to definitly close before going to click	Luke "Jared" Bennett	2017-05-03	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add real-time note edits :chipmunk:	Eric Eastwood	2017-05-03	3	-57/+159
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix project tree saver and fork spec failures	James Lopez	2017-05-03	1	-2/+2
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-05-03	2	-25/+419
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28408-feature-proposal-include-search-options-to-pipelines-api' into 'master' Resolve "Feature Proposal: Include search options to pipelines API" Closes #28408 See merge request !9367
\| \| * \| \| \| \| \| \| \| \| \|	Improve pipelines_finder.rb	Shinya Maeda	2017-05-03	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Correct typo in pipelines_spec.rb	Shinya Maeda	2017-05-03	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Avoid using sample	Shinya Maeda	2017-05-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Use HasStatus::AVAILABLE_STATUSES instead of hard coding	Shinya Maeda	2017-05-03	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Improve api/pipelines_spec.rb	Shinya Maeda	2017-05-03	2	-95/+112
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add another pipeline for spec status	Shinya Maeda	2017-05-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add space before bracket	Shinya Maeda	2017-05-03	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Remove unnecessary hash	Shinya Maeda	2017-05-03	1	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Improve pipelines_finder_spec.rb	Shinya Maeda	2017-05-03	1	-113/+70
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Separate parameters from literal url string	Shinya Maeda	2017-05-03	1	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Use order instead of reorder. Improve tests.	Shinya Maeda	2017-05-03	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Ci::Pipeline to project.pipelines	Shinya Maeda	2017-05-03	2	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \|