home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,669 Commits 48 Branches 340 Tags
eaef332873014047c0bfc7fddd710e90e2c2cd0f
Commit Graph
1584 Commits
Author SHA1 Message Date
Robert SchillingandJacob Vosmaer 33c8c1cc0b Fix labels return code 2014-08-19 18:20:39 +02:00
Jacob Vosmaer 48a943e94a Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master' 
Merge CE 27cf081e1b

See merge request !145
 2014-08-18 10:04:30 +00:00
Dmitriy Zaporozhets 86f6f5a96d Merge branch 'redmine-fix' 2014-08-15 17:48:01 +03:00
Job van der Voort 0d9f8494a8 add tests to redmine integration improvement 2014-08-15 16:03:10 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets 7de26f1922 Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

Tested as follows:

- sign in LDAP user;
- disable access via LDAP (in this case, disable the account in AD);
- check that the user can still access Git via SSH;
- check that the user can still browse and do API calls (issue dropdown);
- set the last_credential_check_at attribute to 2 hours ago in the console;
- SSH access fails;
- API call returns 401.

If I try to sign in again after the LDAP account was disabled, the effect is immediate.

See merge request !139
 2014-08-13 13:11:30 +00:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Jan-Willem van der Meer 3a42051d55 Use CGI encoding to ensure email address is transported correctly 
Tnx to @jacobvosmaer for the suggestion
source: http://stackoverflow.com/questions/4394381/rails-url-helper-not-encoding-ampersands
 2014-08-13 12:04:53 +02:00
Jan-Willem van der Meer 352ec75b7d Merge remote-tracking branch 'origin/master' into feature-admin-emails 
Conflicts:
	db/schema.rb
 2014-08-12 17:59:24 +02:00
Jan-Willem van der Meer 1dd995a763 Move tests as well, remove public namespace from controller 2014-08-12 17:56:29 +02:00
Jan-Willem van der Meer 725891d80f Do not display other behaviour if the email address does not exist 2014-08-12 17:47:01 +02:00
Dmitriy Zaporozhets 53ead2e35c Merge branch 'more-email-threading' into 'master' 
Additions to email threading

This MR follows !142:

* Add threading to "Merge request reopened" emails (see 310231dbed)

See merge request !145
 2014-08-12 12:28:19 +00:00
Jan-Willem van der Meer 196921e5fc Add test for jira_issue_transition_id 2014-08-12 09:54:43 +02:00
Jan-Willem van der Meer e0d6a086c1 Add request specs for unsubscribe 2014-08-11 13:37:21 +02:00
Jan-Willem van der Meer aa31260d7e Enable unsubscribe for admin emails 2014-08-11 13:01:53 +02:00
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Jan-Willem van der Meer 71f7675cd9 Display list of recipientgroups properly 
- Use html5 validation
- initiate create action
 2014-08-08 20:47:08 +02:00
Jan-Willem van der Meer 2be5aab425 Use singular route 
Even simpler
 2014-08-08 15:24:14 +02:00
Jan-Willem van der Meer dbc60e7f35 Add initial email route 2014-08-08 14:34:15 +02:00
Dmitriy Zaporozhets a0755d2f05 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:46:17 +03:00
Dmitriy Zaporozhets fe228b89d5 Fix application helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:12:02 +03:00
Jacob Vosmaer 5629546794 Merge remote-tracking branch 'origin/master' into ldap/cache_check 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
 2014-08-06 18:09:07 +02:00
Jacob Vosmaer e0fea696c6 Skip LDAP cache check when LDAP is disabled 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 1118a6fd34 Add a spec for User#requires_ldap_check? 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets 349eaaa9c2 Fix gfm specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 12:15:05 +03:00
Dmitriy Zaporozhets e4c6dbe35f Fix api files specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:57:15 +03:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets b954f24420 Fix MR controller tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:07:11 +03:00
Dmitriy Zaporozhets 4710a76a8d Fix commit specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 18:06:28 +03:00
Dmitriy Zaporozhets 9338ed0606 Fix project and notes specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 17:54:44 +03:00
Dmitriy Zaporozhets 7e1680934b Fix API branch specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 17:30:28 +03:00
Dmitriy Zaporozhets 72053703e8 Fix API repository specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 15:41:02 +03:00
Dmitriy Zaporozhets 0082cfb146 Fix notify specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 15:18:17 +03:00
Dmitriy Zaporozhets ff5176d45a Fix git_push service specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-01 15:11:27 +03:00
Dmitriy Zaporozhets 394ac378f8 Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 23:05:30 +03:00
Dmitriy Zaporozhets 7783f5ec73 Improve copy test repo cmd 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 21:30:35 +03:00
Dmitriy Zaporozhets a35a22ae05 Remove test dir only if exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 21:01:42 +03:00
Dmitriy Zaporozhets cbe4891d7c Fix form mr tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 20:13:27 +03:00
Dmitriy Zaporozhets 49b119fa31 Remove old test seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 19:38:26 +03:00
Dmitriy Zaporozhets 61f70334ef Cleanup test dir before install gitlab-shell. Fix fork test scenario 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 19:35:07 +03:00
Dmitriy Zaporozhets b238b1544c Recreate tmp/tests on each test run 2014-07-31 19:24:53 +03:00
Dmitriy Zaporozhets ee4643c732 Fix MR tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 19:19:40 +03:00
Dmitriy Zaporozhets 5a68c20fba Fix MR factory and some MR tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 18:07:24 +03:00
Dmitriy Zaporozhets c2c7d14ec5 Move all test repos data to ReposHelpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 17:23:40 +03:00
Dmitriy Zaporozhets bb2f4d665e Fix browse code spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 16:20:47 +03:00