53419bf330
Merge branch 'qwazerty-hipchat_api' into 'master'
...
Add Hipchat services API
Manual merge of https://github.com/gitlabhq/gitlabhq/pull/7633
See merge request !1202
2014-10-21 10:11:13 +00: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
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
85ddf1b918
Merge pull request #8087 from cirosantilli/end_with
...
Replace match with end_with: more readable, faster
2014-10-21 11:42:50 +03:00
44e6b80271
Merge branch 'empty_wiki_backup_check' into 'master'
...
Empty wiki backup check
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
See merge request !1195
2014-10-20 12:20:29 +00:00
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
d4bc125581
Merge pull request #7856 from cirosantilli/error-to-msg
...
Fix missing flash on file edit error from web UI.
2014-10-20 12:52:17 +03:00
8ad1330b6a
Ask the wiki repo, not Gollum, if it's empty
...
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
2014-10-20 10:52:29 +02:00
2901042196
Replace match with end_with: more readable, faster
2014-10-18 22:41:39 +02:00
3880bb6176
Merge pull request #8058 from bbodenmiller/patch-14
...
simplify DHE parameter generation
2014-10-18 09:32:30 +02:00
f8cdd62e22
Fix account existing blocking
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-17 14:08:02 +03:00
077fc683fa
simplify DHE parameter generation
2014-10-16 14:34:03 -07: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
b5763e91cd
add gitlab-shell identification
2014-10-15 20:03:25 +03:00
62b322d7b5
Add Hipchat services API
2014-10-14 19:07:34 +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
2d23522107
Use :message key, not :error for File::Service.
2014-10-13 20:55:09 +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
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's`.
Fixes #1034
See merge request !1165
2014-10-12 18:50:55 +00:00
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
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
be14c7a83f
Add a comment on why we are using backward compatible ciphers.
2014-10-10 09:44:08 +02:00
8ddb2be69a
Revert "update ssl_ciphers"
...
This reverts commit c41e5f5018
2014-10-10 09:38:39 +02:00
fc2adfb6e4
Add a comment why this is done.
2014-10-10 08:32:05 +02:00
1d14676e0c
Substitute right single quote back with apostrophe.
2014-10-10 08:24:58 +02:00
64e72af3cb
Replace apostrophe with right single quote to avoid markdown interpretation as issue 39.
2014-10-09 14:20:49 +02:00
b4828f4cf6
Enable markdown pipeline filters from inside gitlab.
2014-10-09 13:33:38 +02:00
e1123e08f4
Merge pull request #7988 from marcaube/patch-1
...
Import - Display message when skipping repo
2014-10-08 12:05:18 +02:00
ae5381f2cc
Update import.rake
...
Output a message when a repo is skipped
2014-10-07 14:13:50 -04:00
06c91aa20e
Improve wiki path parsing in internal api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 17:28:55 +03: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
ac6f032122
Merge pull request #7779 from Bugagazavr/hook_tag_push_events
...
Add tag push events to project hook api
2014-10-03 13:38:56 +03:00
Dmitriy Zaporozhets
Dmitriy Zaporozhets
Jacob Vosmaer
Ciro Santilli
Robert Schilling
Ben Bodenmiller
Jan-Willem van der Meer
Valery Sizov
Kevin Houdebert
Marin Jankovski
Marc Aubé
Vinnie Okada