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
12,441 Commits 48 Branches 340 Tags
eaebc20eba284a84fef17b2159f7eb6f87f2ff82
Commit Graph
1675 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets eaebc20eba Merge branch 'disable_email_option' into 'master' 
Disable email option

Fixes #1569

See merge request !1222
 2014-10-28 13:36:28 +00:00
Marin Jankovski 28c08775b3 Add a comment in interceptor spec. 2014-10-27 15:11:03 +01:00
Marin Jankovski 3b6737f970 Add interceptor test. 2014-10-27 15:08:37 +01:00
Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-27 12:08:44 +02:00
Valery Sizov 7f97a1277d internal snippets: fix exposing of title 2014-10-24 19:39:14 +03:00
Jacob VosmaerandValery Sizov 16a10eb1cd Fix LDAP config lookup for provider 'ldap' 2014-10-24 12:53:32 +03:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Robert Schilling 744e11c324 Merge pull request #8053 from mr-vinn/fix-rspec-url 
Fix Rspec error when using non-default port
 2014-10-23 12:11:08 +02:00
Marin JankovskiandValery Sizov 536f61e0e7 Add test for allowed team name of slack. 2014-10-21 14:35:13 +03:00
Valery Sizov fbe9b00fc9 Merge branch 'slack_team_name' into 'master' 
Slack team name

Fixes a problem in slack team name with hyphens.

https://gitlab.com/gitlab-org/gitlab-ce/issues/701

See merge request !1204
 2014-10-21 11:19:52 +00:00
Marin Jankovski cccfede34c Add test for allowed team name of slack. 2014-10-21 11:33:26 +02:00
Dmitriy Zaporozhets c624b45bd0 Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwazerty-hipchat_api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-10-21 11:46:45 +03:00
Dmitriy Zaporozhets ab2db486b8 Merge branch 'security-api-internal-publicity' into 'master' 
Gitlab-shell identification

Part of gitlab/gitlabhq#1528

See merge request !1185
 2014-10-20 10:47:43 +00:00
Vinnie Okada f2764e566e Use actual GitLab URL for test assertion 
Assert the full GitLab root URL, including the port, instead of using a
regexp to tolerate whatever port is returned.
 2014-10-18 00:04:21 -05:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer fad588f2be Remove LDAP save test 
This is handled within the LDAP class
 2014-10-16 17:18:40 +02:00
Vinnie Okada 786045ab81 Fix Rspec error when using non-default port 
Prevent test failures when GitLab is configured to use a port other than
80.
 2014-10-16 00:03:10 -05:00
Valery Sizov b5763e91cd add gitlab-shell identification 2014-10-15 20:03:25 +03:00
Kevin Houdebert 62b322d7b5 Add Hipchat services API 2014-10-14 19:07:34 +02:00
Jan-Willem van der Meer 23b692c701 Add specs for authentication and config 2014-10-14 09:31:38 +02:00
Jan-Willem van der Meer 5e1c39cb78 Merge tests to support Multiple LDAP groups 2014-10-13 17:33:44 +02:00
Jan-Willem van der Meer 01b791237c Refactor lib files for multiple LDAP groups 2014-10-13 17:24:05 +02:00
Dmitriy Zaporozhets 05fca6bfc2 Merge branch 'sorting-users-in-admin' into 'master' 
Sorting users in admin

See merge request !1170
 2014-10-13 13:59:17 +00:00
Valery Sizov 4e0da2325b Admin: user sorting 2014-10-13 16:07:57 +03:00
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00:00
Dmitriy Zaporozhets 4731d77bb2 Merge pull request #8020 from mr-vinn/note-trunc-link 
Improve event note display in dashboard and project activity views
 2014-10-13 11:40:50 +03:00
Vinnie Okada b3c70d001d Improve dashboard note view and add tests 
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
 2014-10-12 23:56:56 -05:00
Dmitriy Zaporozhets b956605f9e Merge branch 'ambiguous-sha' into 'master' 
Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171
 2014-10-12 20:28:21 +00:00
Dmitriy Zaporozhets 7a01d0cc74 Merge branch 'bug_with_apostrophe' into 'master' 
Bug with apostrophe when at mentioning users

This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin&#39;s`.

Fixes #1034

See merge request !1165
 2014-10-12 18:50:55 +00:00
Dmitriy Zaporozhets b02c21df5c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-12 21:49:20 +03:00
Dmitriy Zaporozhets b09fd2337a Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' 
Enabling markdown pipelines from gitlab

Define which markdown pipelines are used in GitLab from application instead from gem.

See merge request !1164
 2014-10-12 18:33:27 +00:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Dmitriy Zaporozhets 0852d5e480 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:36:06 +03:00
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:39:48 +03:00
Jan-Willem van der Meer d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +02:00
Marin Jankovski 1d14676e0c Substitute right single quote back with apostrophe. 2014-10-10 08:24:58 +02:00
Valery Sizov 82c938ad75 annotate 2014-10-09 18:22:20 +03:00
Marin Jankovski a912308340 Add a test for apostrophe in code blocks. 2014-10-09 16:12:17 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Marin Jankovski 64e72af3cb Replace apostrophe with right single quote to avoid markdown interpretation as issue 39. 2014-10-09 14:20:49 +02:00
Marin Jankovski 099cf3558f Failing test for apostrophe at the end of user mention on project with issue iid 39. 2014-10-09 14:02:10 +02:00
Dmitriy Zaporozhets 21e9ed2eaf Merge branch 'improve-danger-zone' into 'master' 
Improve danger zone

* show transfer/remove boxes by default
* ask person to type project name before transfer/remove

Fixes #1347

See merge request !1161
 2014-10-08 13:58:31 +00:00
Dmitriy Zaporozhets b485fdb5c1 Improve project remove spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 15:05:14 +03:00
Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service 
Conflicts:
	app/models/project.rb
 2014-10-08 16:33:53 +08:00
Keith Pitt 76594d474c Added support for Buildbox 2014-10-08 16:30:04 +08:00
Dmitriy Zaporozhets 0bf99f6557 Developers can push to wiki repo. Protected branches does not affect wiki repo any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 16:05:24 +03:00
Dmitriy Zaporozhets 70004f4ef6 Merge branch 'slack_integration' into 'master' 
Slack integration

See merge request !1151
 2014-10-06 16:14:48 +00:00
Marin Jankovski 0fed1b5876 Merge pull request #7964 from mr-vinn/task-lists 
Add task lists to issues and merge requests
 2014-10-06 17:29:06 +02:00