root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
44,367 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1939 Commits

Author SHA1 Message Date
Sean McGivern 86af3ed55e Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master' 
Promote project labels to group labels

Closes #24021

See merge request !7242
 2017-01-31 13:35:26 +00:00
Ritave 5d871dccbe Abillity to promote project labels to group labels 
Fixes #24021
 2017-01-31 12:50:52 +01:00
Kamil Trzciński e4bcdddfa7 Merge branch 'zj-display-error-team-fetch' into 'master' 
Fix inconsistent return type

Closes #27150

See merge request !8290
 2017-01-31 11:40:27 +00:00
Rémy Coutable 211f728ad2 Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master' 
Expose pipelines API for commits and merge requests

See merge request !8837
 2017-01-31 07:48:40 +00:00
Luke "Jared" Bennett bfbdc62a3f Added labels empty state and priority label empty state 
Fixed delete labels not working

Review changes
 2017-01-30 17:54:48 +03:00
Z.J. van de Weg b3de65bcc5 Update #list_teams to propagate errors 2017-01-30 11:01:36 +01:00
Grzegorz Bizon 3cb37c0349 Expose serialized pipelines API for merge requests 2017-01-27 13:44:48 +01:00
Grzegorz Bizon 1ad6b3696b Expose serialized pipelines for commit pipelines 2017-01-27 13:32:21 +01:00
Robert Speicher b9ff4656a8 Merge branch '26943-fix-user-in-build-presenter' into 'master' 
Don't override Ci::Build#user when presenting a build

Closes #26943

See merge request !8668
 2017-01-27 11:30:57 +00:00
Felipe Artur b423778b24 Remove unused js response from refs controller 2017-01-26 17:35:12 -02:00
Douglas Barbosa Alexandre 232b401429 Fix access to the wiki code via HTTP when repository feature disabled 2017-01-25 15:38:38 -02:00
Z.J. van de Weg 85f0229b15 Fix inconsistent return type 2017-01-24 14:18:30 +01:00
Rémy Coutable 0ac65b6cc3 Don't override presentee methods for Gitlab::View::Presenter::Delegated 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-01-24 10:24:47 +01:00
Mike Greiling 7b9aa79ddc pass username and id associations needed in the frontend 2017-01-20 15:35:39 -06:00
Mike Greiling 41b6cfcf03 automatically redirect urls containing author_id or assignee_id 2017-01-20 14:50:47 -06:00
Rémy Coutable 34ef6ce3d3 Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' 
Moved the webhooks and services gear options to a single one called integrations

See merge request !8380
 2017-01-20 10:05:19 +00:00
Dmitriy Zaporozhets 9a985f6ec3 Merge branch '23563-document-presenters' into 'master' 
Document presenters

Closes #23563

See merge request !8480
 2017-01-19 14:51:25 +00:00
Kamil Trzciński fd1e4c7519 Merge branch '26117-sort-pipeline-for-commit' into 'master' 
Add sorting pipelines for a commit

Closes #26117

See merge request !8319
 2017-01-19 12:41:51 +00:00
Takuya Noguchi 2dd5db749f Add sorting pipeline for a commit 2017-01-19 18:04:02 +09:00
Jose Ivan Vargas 7b3ea49a44 Fixed tests and a rubocop linter 2017-01-18 15:40:16 -06:00
Jose Ivan Vargas 0af9943314 Removed the index action from both the projects hook and services controllers 2017-01-18 15:19:35 -06:00
Jose Ivan Vargas 373411d18d Corrected code style and titles 2017-01-18 15:19:35 -06:00
Jose Ivan Vargas 9f0d794513 Moved the webhooks and services gear options to a single one called integrations 2017-01-18 15:19:35 -06:00
Douwe Maan 1cc6d206b5 Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' 
Refactor cycle analytics stages (1st iteration)

See merge request !7647
 2017-01-18 18:22:35 +00:00
Rémy Coutable 061bb6eb6e More improvements to presenters 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-01-18 16:38:35 +01:00
Rémy Coutable 78874519db Add Presentable concern 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-01-18 16:38:34 +01:00
Sean McGivern cdf0af666c Merge branch 'i-#25814-500-error' into 'master' 
Fix Compare page throws 500 error when any branch/reference is not selected

Closes #25814

See merge request !8523
 2017-01-18 11:02:45 +00:00
Sean McGivern 25709853cb Merge branch '24915_merge_slash_command' into 'master' 
Support `/merge` slash command for MRs

Closes #24915

See merge request !7746
 2017-01-17 16:10:43 +00:00
James Lopez 69ecd951a9 refactor fetcher and fixed specs 2017-01-17 11:32:55 +01:00
James Lopez b805666984 refactor cycle analytics - updated based on MR feedback 2017-01-17 11:32:55 +01:00
James Lopez a67311cb4c Fix other spec failures 2017-01-17 11:32:55 +01:00
James Lopez 02e1e48192 more refactoring and fixing old specs 2017-01-17 11:32:54 +01:00
James Lopez fc6f8f2056 added new summary serializers and refactor all of the summary stuff into separate logical classes 2017-01-17 11:32:54 +01:00
Martin Cabrera 856003cfea refactor rubocop suggestion 2017-01-16 23:17:24 +01:00
Martin Cabrera 9844c1f222 Refactored ‘from’ and ‘to’ variable preservation 2017-01-16 20:23:30 +01:00
Martin Cabrera 0413a7ad03 from or to get variables gets preserved if the other one is missing 2017-01-15 02:26:29 +01:00
Martin Cabrera 241e2e875b Merge branch 'master' into i-#25814-500-error 2017-01-15 01:18:38 +01:00
Martin Cabrera c2283a2db7 Changed alert message character: from & to and 2017-01-15 01:12:19 +01:00
Jarka Kadlecova 557a0bf14c Address MR comments 2017-01-13 09:16:35 -05:00
Robert Speicher e75b1f1105 Merge branch '24185-legacy-ci-status-reactive-cache' into 'security' 
Use ReactiveCaching to update external CI status asynchronously

See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055
 2017-01-12 17:39:46 -05:00
Jarka Kadlecova aa934c7469 refresh merge widget after using /merge command 2017-01-11 08:48:07 -05:00
Jarka Kadlecova 7ab3dd4b30 support `/merge` slash comand for MRs 2017-01-11 08:48:07 -05:00
Martin Cabrera 5dc8fe31ba Fix Compare page throws 500 error when any branch/reference is not selected 2017-01-10 23:15:56 +01:00
Regis 6625f479f8 Merge branch 'master' into auto-pipelines-vue 2017-01-09 10:54:02 -07:00
Alfredo Sumaran 9cdfcbb50f Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' 
Moved the members and groups to single option called members

Closes #25985

See merge request !8281
 2017-01-06 20:17:34 +00:00
Grzegorz Bizon b5dfd03efc Include resources to speed up pipelines serializer 2017-01-05 14:23:49 +01:00
Regis 1655824fa4 Merge branch 'master' into auto-pipelines-vue 2017-01-04 10:55:25 -07:00
Fatih Acet 8fa58c719b Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master' 
Resolve changing "from" version in diff comparison does not preserve "to" version

Closes #25836

See merge request !8328
 2017-01-03 19:32:54 +00:00
Jose Ivan Vargas 075aae2503 Updated the "users" to "members" matches in the view 
Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller
 2017-01-03 10:52:14 -06:00
Jose Ivan Vargas 57b5612aaa Removed the "Groups" option from the settings gear 
Fixed more tests
 2017-01-03 10:52:14 -06:00