f56541de9a
Revert "Create dev fixture projects with fixed visibility"
...
This reverts commit a9fadce361
2014-11-10 16:17:04 +02:00
6641341b65
Merge pull request #8254 from cirosantilli/factor-get-shell-version
...
Factor GITLAB_SHELL_VERSION get method
2014-11-08 11:04:56 +02:00
1d337defec
Merge pull request #8168 from cirosantilli/dev-fixtures-visibility
...
Create dev fixture projects with fixed visibility
2014-11-07 15:26:48 +01:00
bf8b874117
fix system silent call
2014-11-06 13:07:42 +02:00
d1b489e048
Revert "Revert "Don't output to stdout from lib non-interactive methods""
...
This reverts commit b33d4bc2f1
2014-11-06 13:07:16 +02:00
b33d4bc2f1
Revert "Don't output to stdout from lib non-interactive methods"
...
This reverts commit 0b1084a453
2014-11-06 11:58:00 +02:00
f36db59d97
Factor GITLAB_SHELL_VERSION get method
2014-11-05 17:16:04 +01:00
2b00de710d
Merge pull request #8236 from cirosantilli/rm-lib-stdout
...
Don't output to stdout from lib non-interactive methods [failure unrelated]
2014-11-05 16:24:50 +02:00
0b1084a453
Don't output to stdout from lib non-interactive methods
...
It pollutes the test output too much.
2014-11-05 12:35:33 +01:00
42a1d8083c
Merge pull request #7516 from cirosantilli/update-regex-msg
...
Update default regex message to match regex.
2014-11-05 11:38:29 +01:00
876c6f2491
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-11-04 10:48:38 +02:00
71ed0ab069
Fix push not allowed to protected branch if
...
commit starts with 7 zeros.
2014-11-03 20:37:47 +01:00
e1c48f1431
Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
2014-11-03 14:10:53 +02:00
e9171fea85
Merge pull request #8217 from bbodenmiller/change-label-generation
...
remove feature label
2014-11-01 10:38:25 +01:00
3e55d56c90
remove feature label
...
For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
2014-10-31 17:22:16 -07:00
d549a2a525
Factor lib backend gitlab shell path
2014-10-31 13:00:50 +01:00
bafd30f92c
Session API: Use case-insensitive authentication like in UI
2014-10-30 18:29:18 +02:00
f4178f9601
Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
...
Use Gitlab.config instead of Settings everywhere
2014-10-27 19:18:48 +02:00
a9fadce361
Create dev fixture projects with fixed visibility
2014-10-26 11:34:50 +01:00
472a6621e9
Fix LDAP config lookup for provider 'ldap'
2014-10-23 22:57:16 +02:00
1c1d9f78a4
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-10-23 16:41:39 +02:00
6b2b20af41
Fix LDAP authentication for Git HTTP access
2014-10-23 14:21:58 +02:00
36649fc250
Merge pull request #8150 from cirosantilli/unecessary-variable-user
...
Remove unused variable user at lib/gitlab/markdown
2014-10-23 13:58:24 +02:00
40815b2baf
Remove unused variable user at lib/gitlab/markdown
2014-10-23 13:12:21 +02:00
c5ad011917
Merge branch 'fix-ldap-check' into 'master'
...
Fix ldap check
Fixes gitlab/gitlabhq#1691
See merge request !1206
2014-10-22 08:07:08 +00:00
da21b9e7d0
Fix rake gitlab:ldap:check
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-21 18:26:40 +03:00
d29dd2cfec
Merge pull request #8117 from cirosantilli/improve-grack-comment
...
Improve grack auth hooks comment.
2014-10-21 13:10:00 +02:00
ce056d8074
Improve grack auth hooks comment.
2014-10-21 12:36:09 +02:00
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
39c66c822e
Use Gitlab.config instead of Settings everywhere
2014-10-15 23:01:31 +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
Dmitriy Zaporozhets
Marin Jankovski
Valery Sizov
Ciro Santilli
Robert Schilling
Ben Bodenmiller
Andrey Krivko
Jacob Vosmaer
Dmitriy Zaporozhets
Jan-Willem van der Meer
Vinnie Okada