ee068e76f3
Merge pull request #7961 from cirosantilli/dry-log-file-names
...
Factor admin logs [failure unrelated]
2014-10-21 11:59:41 +03:00
f8cdd62e22
Fix account existing blocking
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-17 14:08:02 +03:00
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
6ce65a3e95
Use Hash syntax for LDAP server declaration
2014-10-14 13:13:59 +02:00
9bf7bfda20
Remove unused methods
2014-10-14 12:09:24 +02:00
ab04096c6c
Add explaining note to authentication method [skip ci]
2014-10-14 11:16:47 +02:00
18d2ee31e8
Use server specific uid
2014-10-14 10:54:43 +02:00
d3056feb11
Make sure the filters are applied
2014-10-14 10:08:47 +02:00
b229b0f003
Fix authorization for LDAP login
2014-10-14 09:40:35 +02:00
93505f7d04
DRY find method to find Gitlab user
2014-10-14 09:05:29 +02:00
410d6e306b
Remove unused method
2014-10-14 08:54:15 +02:00
01b791237c
Refactor lib files for multiple LDAP groups
2014-10-13 17:24:05 +02:00
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
2ea166fc33
Make sure relative url and asset_host are honored, specs.
2014-10-10 17:31:47 +02:00
d059f50d4c
Refactor OAuth refactorings to CE
2014-10-10 12:03:32 +02:00
b4828f4cf6
Enable markdown pipeline filters from inside gitlab.
2014-10-09 13:33:38 +02:00
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
7bcd6f79a4
Merge pull request #7963 from cirosantilli/factor-previewable
...
Factor markup? || gitlab_markdown? into new method
2014-10-07 12:19:28 +03:00
9f0083a96c
Add task lists to issues and merge requests
...
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input. Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks. Task status is also displayed in the MR and issue
lists.
2014-10-05 22:15:27 -05:00
9bebacd692
Dry admin logs.
2014-10-06 00:14:46 +02:00
a9cd3bfaee
Fix external commit links
...
Display the '@' character for links to commits in other projects.
2014-10-05 10:16:12 -05:00
bcf88c8559
Fix external issue links
...
Display the project path in links to issues in other projects that use
an external issue tracker.
2014-10-05 10:12:53 -05:00
07e9cb6b77
Factor markup? || gitlab_markdown? into new method
2014-10-04 17:56:12 +02:00
2c46c4523f
Track projects in ReferenceExtractor
...
Store both the project and identifier of extracted references. This
prevents `ReferenceExtractor` from returning objects in the wrong
project for cross-project references.
2014-10-03 12:30:20 -05:00
7edc1439fe
Fix ReferenceExtractor
...
The cross-project reference feature broke the ReferenceExtractor class;
this fixes it.
2014-10-03 12:30:20 -05:00
1b1ba6b0a5
Implement cross-project Markdown references
...
Enable linking to commits, merge requests, and issues in other projects
by prepending a namespaced project path to the reference.
2014-10-03 12:30:20 -05:00
2e9f5de868
Add parenthesis to function def with arguments.
2014-10-03 09:18:46 +02:00
6c3ad0dab6
Merge pull request #7853 from Razer6/feature/html_pipeline
...
Factor out Emoji parsing using html-pipeline-gitlab
2014-10-02 11:18:40 +03:00
f7aba277e7
Add option to gitlab config to specify if LDAP server is active directory.
2014-09-30 12:07:31 +02:00
3a8cd1fa59
Refactor commits graph
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-29 12:05:17 +03:00
390183a426
Factor out Emoji parsing using html-pipeline-gitlab
2014-09-26 01:32:33 +02:00
66ef5c1aa2
Fix satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 16:10:10 +03:00
424b42d6e9
Fix 500 error on empty search in project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 15:01:02 +03:00
4b65b0e0f5
Fix wiki
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 13:56:23 +03:00
b13c1469a3
Rollback diff drop and set default commit id to HEAD
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 12:46:30 +03:00
13aec95264
Improve diff and bump gitlab_git revision
2014-09-24 15:59:57 +03:00
53f2130e63
Use new version of gitlab_git with extended rugged usage
2014-09-24 13:26:53 +03:00
f12d6278ed
Fix ref parsing in Gitlab::GitAccess
2014-09-23 13:18:36 +02:00
c69b8e0459
Huge replace of old users_project and users_group references
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
bf0de1a500
Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring
2014-09-11 11:46:08 +02:00
6b7e80cb19
Prevent 500 error when search wiki for non-existing repo
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-09 17:56:33 +03:00
638331d05a
Merge branch 'parallel_diff_refactor' into 'master'
...
Parallel diff refactor
Refactor side-by-side diff to remove code duplication.
Base the side-by-side diff on inline diff code.
In first iteration:
1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code
See merge request !1066
2014-09-09 13:57:50 +00:00
0e78d00bcb
Merge pull request #7695 from coverer/search_wiki
...
Added search wiki feature
2014-09-09 16:50:43 +03:00
685757b9d6
Prevent people from using ci since we plan to host ci on /ci later.
2014-09-09 10:11:07 +02:00
9e4a40982e
Merge pull request #7646 from bushong1/snippet-search3
...
Adding in snippet search functionality
2014-09-09 10:31:21 +03:00
218219abbd
Refactoring inside refactoring. We need to go deeper
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 21:54:52 +03:00
bde3f25d26
Specs for diff parser! Yay!
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 20:42:12 +03:00
531f16beb0
Use new diff parsing logic
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:27:12 +03:00
4ef809c77d
Gitlab::Diff classes added
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:25:50 +03:00
b18d1c2786
Remove duplicated create method
2014-09-08 15:25:42 +02:00
Dmitriy Zaporozhets
Jan-Willem van der Meer
Dmitriy Zaporozhets
Marin Jankovski
Vinnie Okada
Ciro Santilli
Robert Schilling
Jacob Vosmaer
Sytse Sijbrandij