home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,522 Commits 48 Branches 340 Tags
697b34d786bcbc9b4fdaef485ff4837b850ca5aa
Commit Graph
2160 Commits
Author SHA1 Message Date
Kamil Trzcinski 065fe557f7 Fixed failure reading .gitlab-ci.yml 2015-10-06 12:00:15 +02:00
Kamil Trzcinski a266752821 Latest builds always include builds with unique name and unique ref 2015-10-06 11:59:55 +02:00
Dmitriy Zaporozhets b2803a5e05 Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 20:15:43 +02:00
Dmitriy Zaporozhets 3d90560c1e Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 20:14:32 +02:00
Kamil Trzcinski f088ffe8f7 Merge branch 'rs-remove-ci-disable' 
See merge request !1512
 2015-10-05 20:06:31 +02:00
Robert Speicher fc59c45d58 Remove the option to disable CI 
This option only existed to ease the CI-to-CE/EE migration process.

This commit partially reverts 8b05abe816
 2015-10-05 12:23:38 -04:00
Peter Göbel 291e1fa930 improved code style and layout option naming 2015-10-05 18:09:05 +02:00
Peter Göbel e2c5d08e7e added user preference to change layout width 2015-10-05 17:22:47 +02:00
Kamil Trzcinski 29a7c6796e Fix GitLabCiService and remove ci_yaml_file from CI push data 2015-10-05 16:06:35 +02:00
Kamil Trzcinski c985389722 Add stage tests 2015-10-05 15:59:31 +02:00
Kamil Trzcinski 0367dbf043 Fix build pipelining 2015-10-05 14:15:15 +02:00
Kamil Trzcinski 5064c9038c Fix next bunch of tests 2015-10-05 13:51:28 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Kamil Trzcinski 361dc3641d Fix builds_without_retry 2015-10-05 12:38:00 +02:00
Kamil Trzcinski 317a746954 Make commit_spec run 2015-10-05 12:02:26 +02:00
Kamil Trzcinski e3d870d7fc Add user to Ci::Build to have pusher email address 2015-10-05 10:15:40 +02:00
Kamil Trzcinski 546a3c6561 Refactor commit and build 2015-10-05 09:52:35 +02:00
Guilherme Garnier 1cfb48ddd0 Merge remote-tracking branch 'upstream/master' 2015-10-03 11:46:29 -05:00
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
Dmitriy Zaporozhets 0e7b96bf48 Merge branch 'access_level_badge_bug' into 'master' 
Fix: Wrong access level badge on MR comments

https://gitlab.com/gitlab-org/gitlab-ce/issues/2654

See merge request !1501
 2015-10-02 14:39:58 +00:00
Douwe Maan 93522e59ec Merge branch 'rs-throttle-reset' into 'master' 
Throttle "Forgot your password?" emails

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611

See merge request !1476
 2015-10-02 14:37:07 +00:00
Valery Sizov 97e6c9b42c Wrong access level badge on MR comments 2015-10-02 15:11:17 +03:00
Dmitriy Zaporozhets c7e323438e Merge branch 'ensure-ci-project' into 'master' 
Ensure GitLab CI project exists when CI service is activated manually

When I check activeated checkbox in project services for GitLab CI it
cause half-working state when gitlab_ci_project is missing. This patch
fixes it until we have proper behaviour implemented later

This fix also bring us to the point when fork of project is a bit broken and have unnecessary code so I made cleanup. 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @ayufan 

See merge request !1491
 2015-10-02 10:39:31 +00:00
Dmitriy Zaporozhets 37e9e71ea1 Remove unnecessary fork ci logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-02 10:26:56 +02:00
Dmitriy Zaporozhets 5de0b07844 Prevent creating 2 Ci::Project entities when enable CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-02 10:08:16 +02:00
Robert Speicher ad7ad8745a Add User#recently_sent_password_reset? 2015-10-01 21:41:56 -04:00
Robert Speicher 8366ce364c Merge branch 'rs-update-note' into 'master' 
Ensure updated notes are syntax highlighted

See merge request !1444
 2015-10-01 17:10:52 -04:00
Dmitriy Zaporozhets e3bc0e2104 Ensure GitLab CI project exists when CI service is activated manually 
When I check activeated checkbox in project services for GitLab CI it
cause half-working state when gitlab_ci_project is missing. This patch
fixes it until we have proper behaviour implemented later

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-01 18:10:09 +02:00
Douwe Maan 96c2e22549 Merge branch 'disable-report-button-if-already-reported' into 'master' 
Disable the "Report abuse" button if a user has already been reported

Hello,

I've implemented the feature request #2330. Here is what it looks like:

![report-abuse-button-disabled](https://gitlab.com/rymai/gitlab-ce/uploads/420d51906eac1c40c50701a0a340474f/report-abuse-button-disabled.png)

I hope that's an acceptable solution.

cc @DouweM

See merge request !1456
 2015-10-01 13:17:18 +00:00
Kamil Trzciński 114853063b Merge branch 'ci-fixes' into 'master' 
CI: Fix clone url and fix project token removal

- Fixes broken CI clone url on dev.gitlab.org
- Fixes regression in CI token removal

/cc @vsizov @dzaporozhets 



See merge request !1481
 2015-10-01 12:59:39 +00:00
Douwe Maan 41b08e4a08 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-01 12:34:32 +02:00
Douwe Maan 7c7b664c01 Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookup 2015-10-01 12:33:51 +02:00
Kamil Trzcinski 0e54847339 Fix: CI token removal regression from build trace 2015-10-01 11:43:06 +02:00
Kamil Trzcinski 9d8257238e Fix: broken git clone URL for CI runners 2015-10-01 11:42:41 +02:00
Valery Sizov 5b57313051 Note the original location of a moved project when notifying users of the move 2015-10-01 09:54:56 +03:00
Robert Speicher da347f3602 Simplify Note#editable? 2015-09-30 16:58:35 -04:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects 
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
 2015-09-30 12:48:40 +02:00
Rémy Coutable ea72d53ec0 Streamline the "Report button" 
This simplifies the "Report button" to not use open a dropdown and
adds a tooltip on this button.
This also removes an extra spec and adds missing specs.
 2015-09-29 21:47:01 +02:00
Rémy Coutable 5f95a5e070 Disable the "Report abuse" button if a user has already been reported 2015-09-29 21:11:51 +02:00
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0fa4ab5fd8 Rename commits to ci_commits 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 2c1f7ccac8 Fix register_build_service tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 0e33814708 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 1530f68c98 WIP 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Stan Hu 0383afc66a Add user preference to view project activity and starred project activity as default dashboard 
Closes #2662
 2015-09-26 08:46:05 -07:00
Dmitriy Zaporozhets 352f242d8c Fix admin runner page -> assign all button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-25 17:46:03 +02:00
Dmitriy Zaporozhets b623391720 Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs' 2015-09-25 14:08:30 +02:00