home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,737 Commits 48 Branches 340 Tags
d7bcfe4fc020529f9b6ed2a75dfb2f31acded080
Commit Graph
2098 Commits
Author SHA1 Message Date
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master' 
Simplify code around (cross)-references

See merge request !1568
 2015-10-14 20:10:34 +00:00
Kamil Trzcinski 7af4f5215e Show warning if build doesn't have runners with specified tags or runners didn't connect recently 
Slightly refactor runner status detection: moving it to Runner class

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
 2015-10-14 17:29:18 +02:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
teuneboon 5479797f0a Make group deleted text consistent with group created and updated texts 2015-10-12 14:37:56 +02:00
teuneboon d6a523d785 Fix typo(missing quote) when deleting groups 2015-10-12 14:37:07 +02:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +02:00
Dmitriy Zaporozhets 030b5038b1 Merge branch 'cleanup-ci-pages' into 'master' 
Cleanup CI pages

- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area


cc @ayufan 

Part of #2594

See merge request !1529
 2015-10-07 17:04:54 +00:00
Dmitriy Zaporozhets 7f63a8787c Fix tests and few CI features 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 17:54:49 +02:00
Dmitriy Zaporozhets a30b68fe1d Move CI services to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 16:20:31 +02:00
Dmitriy Zaporozhets 1e06cabf4a Remove Ci::Commit and Ci::Build controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 15:24:32 +02:00
Dmitriy Zaporozhets e52de6771f Remove Continuous Integration from project menu 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:43:58 +02:00
Stan Hu 0ab6ca93aa Add directory feature button 
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557
 2015-10-07 04:22:55 -07:00
Dmitriy Zaporozhets 82b6a17ca7 Fix ci build routing and few tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 21:41:37 +02:00
Dmitriy Zaporozhets 27b75b2b2d Refactor commit/build tests and fix CI cancel 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:36:22 +02:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:15:06 +02:00
Dmitriy Zaporozhets f6223ffb31 Move CI build page to CE project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 19:34:21 +02:00
Dmitriy Zaporozhets ad627e40dc Merge branch 'ci-commit-page' into 'master' 
Render CI statuses on commit page

This MR merges CI commit page into CE commit page.

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

See merge request !1519
 2015-10-06 17:31:54 +00:00
Kamil Trzcinski 17de909a42 Fix broken grouping sql clause when rendering commits for CI 2015-10-06 16:25:27 +02:00
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