home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,522 Commits 48 Branches 340 Tags
697b34d786bcbc9b4fdaef485ff4837b850ca5aa
Commit Graph
2080 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 16:10:17 +02:00
Kamil Trzcinski fc795d6ee2 Fix graphical glitches 2015-10-05 21:20:54 +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
Kamil Trzciński 3eef0e18e0 Merge branch 'refactor-build-service' into 'master' 
Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page

This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build.

All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository.

All code related for creating builds is moved to CreateBuildsService.

Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API.

This is partially working, tests are not yet touched.

This slightly changes view of Commit:
![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png)

@dzaporozhets What do you think?


See merge request !1502
 2015-10-05 17:42:50 +00: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 e2c5d08e7e added user preference to change layout width 2015-10-05 17:22:47 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Dmitriy Zaporozhets c293cc9152 Move CI web hooks page to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 10:47:23 +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 b5c12f742a Merge remote-tracking branch 'public/hide_services_password' 2015-10-02 16:48:38 +02: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 731b860976 Hide password in the service settings form 2015-10-02 12:48:57 +03:00
Robert Speicher b8ff38b1d4 Refactor PasswordsController to use before_actions 2015-10-01 21:47:27 -04:00
Drew Blessing 788a3f9b94 Add last push widget to starred projects dashboard 2015-10-01 15:17:32 -05: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
Dmitriy Zaporozhets 82f1921165 Merge branch 'mr_improve_errors_handling' 2015-10-01 11:28:36 +02:00
Valery Sizov 05fdd12fd9 Improve error message when merging fails 2015-10-01 09:45:47 +03:00
Robert Speicher 292bca0546 Only allow password reset emails once per minute 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
 2015-09-30 15:38:21 -04:00
Robert Speicher 3a4274e19e Take advantage of Devise.sign_in_after_reset_password 2015-09-30 14:35:00 -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
Dmitriy Zaporozhets 87240e989b Move CI project settings page to CE project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:07:44 +02:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 10:37:31 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 17:19:20 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +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 b328c76c06 Move runners page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-25 18:03:41 +02:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00
Dmitriy Zaporozhets 2759b13ae9 Remove CI dashboard 
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 15:10:25 +02:00
Dmitriy Zaporozhets 9c4307e287 Show CI status on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 11:21:39 +02:00
Dmitriy Zaporozhets 50cff3e400 Check for CI enabled in correct place 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 09:47:52 +02:00
Dmitriy Zaporozhets 64e12d5853 Add header for ci graphs and check that it is enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 09:44:38 +02:00
Dmitriy Zaporozhets ea58395525 Merge branch 'master' into move-ci-charts 2015-09-24 09:40:32 +02:00
Douwe Maan a58c6e9a95 Merge branch 'cleanup-ci-dashboard' into 'master' 
Cleanup ci dashboard

Part of #2594. Based on !1403

* remove rendering GitLab projects with not enabled CI on CI dashboard
* remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`)
* simplify the projects query for CI dashboard 

See merge request !1405
 2015-09-24 07:32:29 +00:00
Dmitriy Zaporozhets eae27d1ecb Move CI charts to project graphs area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 16:24:46 +02:00
Dmitriy Zaporozhets 368a40fce6 Remove non-existing page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:35:43 +02:00
Dmitriy Zaporozhets c3f63d6f77 Fix search for ci projects and cleanup unnecessary code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:33:36 +02:00
Dmitriy Zaporozhets 31b15e3dce Simplify CI projects query 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:30:24 +02:00
Dmitriy Zaporozhets 0731a7af31 Show only enabled CI projects 
Since CI is enabled by pushing .gitlab-ci.yml file there is no need to
add CI project via dashboard

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 15:00:05 +02:00
Douwe Maan ff63a166e9 Merge branch 'rs-fix-help-links' into 'master' 
Prevent double-prefixing of help page paths

Closes #2679 

See merge request !1400
 2015-09-23 11:44:17 +00:00
Robert Speicher 95f73a68fa Simplify help path prefixing 2015-09-23 00:24:17 -04:00
Robert Speicher 64e0dfa530 Prevent double-prefixing of help page paths 
Prior, because the link "api/README.md" was matched twice, the first
link became "help/help/api/README.md". Now we do a negative lookahead to
make sure the link doesn't start with `help/`.

This fix is still not ideal, see TODO note.
 2015-09-22 18:26:51 -04:00
Douwe Maan d80750b50f Fix error when MR source branch no longer exists. 2015-09-22 17:49:45 +02:00
Dmitriy Zaporozhets 8ae026a6e6 Merge branch 'fix-ci-permissions' into 'master' 
Fix CI permissions

![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png)

This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users



See merge request !1379
 2015-09-22 07:54:11 +00:00
Robert Speicher ba71542a5a Merge branch 'fix-issue-2593' into 'master' 
Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355
 2015-09-21 20:46:15 +00:00