home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,431 Commits 48 Branches 340 Tags
f04c5b27f0c19dfab00a6ac2de8b4168b67fe7a0
Commit Graph
603 Commits
Author SHA1 Message Date
Robert Speicher f26389a02a Merge branch 'feature/runner-config-untagged-jobs' into 'master' 
Add config for CI Runner that prevents it from picking untagged jobs

Closes #3456

See merge request !4039
 2016-05-19 21:54:33 +00:00
Douwe Maan bd0cecfdf6 Merge branch 'with-pipeline-view' into 'master' 
Add pipeline view

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653

cc @DouweM @grzesiek 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625


See merge request !3703
 2016-05-19 20:42:43 +00:00
Grzegorz Bizon 4cc77c3bf8 Minor runner-related code refactorings 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 2ee24bd9ec Update specs to be valid only for tagged runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 2aa5707194 Extend runner config options for untagged jobs 2016-05-19 22:01:53 +02:00
Jacob Schatz 86b22b4f15 Merge branch 'project-variables-ui' into 'master' 
Project variables UI

![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png)

![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png)

Closes #14091

See merge request !3942
 2016-05-19 18:09:04 +00:00
Kamil Trzcinski ef60b8e168 Use pipelines.errors when communicating the error 2016-05-18 13:02:10 -05:00
Kamil Trzcinski 04933fd572 Use container registry config stub 2016-05-16 18:07:49 -05:00
Kamil Trzcinski 91c4002a0c Improve test coverage 2016-05-16 18:03:55 -05:00
Kamil Trzcinski d0eb9438e9 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-16 17:13:14 -05:00
Kamil Trzcinski eb42f95c18 Merge remote-tracking branch 'origin/master' into docker-registry-view 2016-05-16 16:15:40 -05:00
Douwe Maan 8b15628dd0 Merge branch 'issue_14684' into 'master' 
Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862
 2016-05-16 21:05:05 +00:00
Rémy Coutable 1c86e804ed Merge branch 'unexpected-filtering-on-merge-requests' into 'master' 
Add tests for unintentional filtering bug in MR

!3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues.

This MR has complementary tests for MR list.

See merge request !4154
 2016-05-16 20:23:38 +00:00
Felipe Artur 7bb84e6497 Change landing page when skipping confirmation email and add documentation 2016-05-16 14:56:32 -03:00
Felipe Artur c5526a2d9a Change skip_user_confirmation_email to send_user_confirmation_email 2016-05-16 14:56:32 -03:00
Phil Hughes 99428f193b Updated project variable tests 2016-05-16 10:21:51 +01:00
Sean McGivern bec350528c Force password change after admin reset 
When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
 2016-05-16 09:21:24 +01:00
Takuya Noguchi 0d93e93e79 Add tests for unintentional filtering bug in MR (cf. !3872) 2016-05-15 09:18:23 +09:00
Kamil Trzcinski 654d5ad3f4 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 11:15:33 -05:00
Douwe Maan c452fa8124 Update specs 2016-05-13 17:31:58 -05:00
Kamil Trzcinski ecee057795 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-13 17:15:09 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 6d19e13df6 Fix specs 2016-05-13 17:11:57 -05:00
Kamil Trzcinski 692b5e0b47 Merge branch 'docker-registry' into docker-registry-view 
# Conflicts:
#	app/controllers/jwt_controller.rb
#	app/services/jwt/container_registry_authentication_service.rb
 2016-05-13 16:43:49 -05:00
Kamil Trzcinski c1bc5c58a2 Added pipelines spec 2016-05-13 13:17:15 -05:00
Kamil Trzcinski 886bfb0a4d Initial specs for pipelines 2016-05-13 08:36:44 -05:00
Drew Blessing 4fea5cda0b Fix minor typos in admin health check page 2016-05-12 17:11:37 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master' 
Fix a description for default scope on builds

Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.

Fix a regression on !2243 (#4240).

See merge request !4118
 2016-05-12 22:01:40 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Kamil Trzcinski 5c2f2fd289 Fix CI tests 2016-05-12 13:03:04 -05:00
Takuya Noguchi 18fdbf0a03 Fix a description for default scope on builds 2016-05-13 01:28:55 +09:00
DJ Mountney 0e0caf4d17 Add tests for the health check feature 2016-05-10 16:19:16 -07:00
Rémy Coutable a278b36ab0 Fix an issue when filtering merge requests with more than one label 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-10 19:07:46 +02:00
Rémy Coutable 1026f2ad09 Add integration specs for tags 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-10 11:45:03 +02:00
Kamil Trzcinski d05f0030a3 Added Docker Registry View tests 2016-05-09 23:32:18 +03:00
Rémy Coutable d4d34b161b Merge branch 'rs-backport-ee-372' into 'master' 
Backport changes from gitlab-org/gitlab-ee!372

Mostly replaces several Spinach tests with RSpec Feature tests.

See merge request !4043
 2016-05-09 14:48:48 +00:00
Takuya Noguchi 4ab49fab94 Use outer join for issues ordering by milestones due. 2016-05-06 19:57:26 +09:00
Robert Speicher f18ec70743 Backport changes from gitlab-org/gitlab-ee!372 
Mostly replaces several Spinach tests with RSpec Feature tests.
 2016-05-04 17:05:16 -04:00
Douwe Maan 622ad2355a Merge branch 'rs-unique-signup-fields' into 'master' 
Improve uniqueness of field names on the signup form

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075

See merge request !3826
 2016-05-04 13:33:15 +00:00
Rémy Coutable 5f89c9642e Fix a spec that was failing due to !3483 
Spec were skipped in this MR so that tests started to fail in master
instead of in this MR!

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-04 12:17:12 +02:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Robert Speicher 0652d92526 Merge branch '15527-fix-wiki-page-creation-issue' into 'master' 
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
 2016-05-02 17:18:22 +00:00
Rémy Coutable f1e74de47c Simplify specs by not over-expecting 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-02 18:34:14 +02:00
Phil HughesandJacob Schatz b2ec176539 Removes duplicates from the label dropdown 
It concats the duplicate labels into a single label in the dropdown with
the color being a gradient of the differnet colors being concatted.

Closes #16555
 2016-04-29 12:10:30 -04:00
Rémy CoutableandStan Hu 3811eb0ba1 Fix error when trying to create a wiki page 
Closes #15527.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-29 06:50:18 -07:00
Arinde Eniola ded3b02f33 Use a better message when milestone is newly created 
make some changes for the checks to determine when the messages should be displayed

add item to changelog and also integration test

make some changes to the test

make some changes
 2016-04-29 10:15:49 +01:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously 
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
 2016-04-28 16:13:48 -04:00
Alfredo Sumaran d2f898e7ea Fix Todos test 2016-04-27 14:52:51 -05:00
Jacob Schatz 90c966500a Merge branch 'project-dropdown-tests' into 'master' 
Project title dropdown tests

Added a test for when on an issue page to check whether the project
dropdown links will still work

See !3870

See merge request !3921
 2016-04-27 17:28:48 +00:00
Alfredo Sumaran 5ba79f49a4 Syntax and code improvements 2016-04-26 14:01:40 -05:00