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,195 Commits 48 Branches 340 Tags
28eea9bdfd0b28ad044f76bd4fcf988329ca9921
Commit Graph
582 Commits
Author SHA1 Message Date
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
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
Douwe Maan c452fa8124 Update specs 2016-05-13 17:31:58 -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
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
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
Alfredo Sumaran 7f263ca1de Use variables instead of let 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 89df29e09f Use click_link 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Alfredo Sumaran a1a9a1cf8d Specs for toggle Whitespaces Changes 2016-04-26 14:01:40 -05:00
Marin Jankovski 2f5394f5d6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-26 11:08:56 +02:00
Phil Hughes 3e40b88547 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
 2016-04-26 09:35:58 +01:00
Rémy CoutableandRobert Speicher cd0750e045 Prevent private project name and namespace from leaking in the new MR view 
Fixes #15591.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 15:32:44 -04:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master' 
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
 2016-04-25 19:13:25 +00:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet 
Closes #15509
 2016-04-25 17:19:57 +02:00
Robert Speicher d83d43c553 Merge branch 'rs-todos-feature-spec' into 'master' 
Refactor Todos feature spec to be faster and less brittle

We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.

See merge request !3889
 2016-04-22 17:51:08 +00:00
Robert Speicher 84d3649d57 Merge branch '15513-fix-undefined-can-method' into 'master' 
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
 2016-04-22 17:38:10 +00:00
Robert Speicher bdd844f312 Refactor Todos feature spec to be faster and less brittle 
We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.
 2016-04-22 13:08:11 -04:00
Robert Speicher 10aaea1c91 Merge branch 'fix/cherry-pick-specs-location' into 'master' 
Move cherry-pick feature specs to proper directory

Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`.

Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`).

See merge request !3875
 2016-04-22 15:33:23 +00:00
Rémy Coutable c56ae831db Merge branch 'issue_3799' into 'master' 
Add tests for filtering owned projects

REF: #3799

See merge request !3873
 2016-04-22 15:11:14 +00:00
Rémy Coutable 951e3459e1 Use the can? helper instead of current_user.can? 
Fixes #15513.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-22 15:48:58 +02:00
Alfredo Sumaran 21a1e15677 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-22 08:37:15 -05:00
Phil Hughes 32be8bd2b1 Fixed issue with assignee object not being returned 
Closes #15515
 2016-04-22 13:30:58 +01:00
Grzegorz Bizon b711fc0abd Move cherry-pick feature specs to proper directory 2016-04-22 13:34:03 +02:00
Alfredo Sumaran e0c07b5e3d Add tests for filtering owned projects 2016-04-22 06:19:43 -05:00
Rémy Coutable d5398e9656 Merge branch 'issue_3799' into 'master' 
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
 2016-04-22 08:40:01 +00:00