Robert Speicher
d4a960161e
Merge branch 'rename-reply-by-email' into 'master'
...
Rename reply_by_email to incoming_email to prepare for the future.
Closes #2579 .
See merge request !1367
2015-09-21 18:52:13 +00:00
Sytse Sijbrandij
534bd0f87d
Fix grammar
2015-09-21 16:43:43 +00:00
Douwe Maan
ee028d9d60
Rename reply_by_email to incoming_email to prepare for the future.
2015-09-21 10:35:37 +02:00
Sameer Naik
01c0d14e41
fixes link to reply_by_email docs
2015-09-20 11:25:09 +05:30
Valery Sizov and Kamil Trzcinski
a0c1a12dee
remove API calls from CE to CI
2015-09-18 18:02:11 +02:00
Dmitriy Zaporozhets
ac571623d8
Merge branch 'pg_dump_schema' into 'master'
...
Add pg_schema to backup config
https://dev.gitlab.org/gitlab/gitlabhq/issues/2489
See merge request !1345
2015-09-18 14:33:35 +00:00
Valery Sizov
d7242054ba
add pg_schema to backup config
2015-09-18 16:29:13 +03:00
Kamil Trzcinski
e41a29b0c3
Allow to disable GitLab CI
2015-09-18 12:46:47 +02:00
Kamil Trzcinski
7166f7b7cf
Remove CI help
2015-09-17 17:09:10 +02:00
Robert Speicher
09bcce7d1f
Merge branch 'ldap-attributes' into 'master'
...
Allow configuration of LDAP attributes GitLab will use for the new user account.
Fixes #2412 .
See merge request !1261
2015-09-16 18:34:55 +00:00
Kamil Trzcinski
1b464bfe03
Update documentation and config files
2015-09-16 00:28:59 +02:00
Kamil Trzcinski
e21deaee8e
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
# Conflicts:
# Gemfile.lock
2015-09-15 22:40:35 +02:00
Stan Hu
81e741af24
Merge pull request #9138 from liyakun/master
...
add "replace" and "upload" functionality
2015-09-14 17:57:41 -07:00
liyakun
e2ece2bc35
Add "Replace" and "Upload" features
...
Refactor upload and replace functionality
Rename file and move CSS
Fix typo
Make dropzone a div
Remove unnecessary file
Change color of "upload existing one"
Add missing changes
2015-09-15 02:12:56 +02:00
Kamil Trzcinski
95037c9c55
Revert "monkey patch of Hash"
...
This reverts commit 6014019ed4
2015-09-14 11:27:30 +02:00
Valery Sizov
6014019ed4
monkey patch of Hash
2015-09-14 12:06:52 +03:00
Valery Sizov
25149ce47e
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-14 11:16:56 +03:00
Valery Sizov
ad5d2c3e78
fix of API
2015-09-14 11:15:54 +03:00
Dmitriy Zaporozhets
5fcfba2780
Merge branch 'dashboard-titles' into 'master'
...
Clean up overlap between dashboard and explore
- Clean up overlap between dashboard and explore. ... 5d785457260fcd45d92696d3c258e977!1260
2015-09-11 14:36:56 +00:00
Dmitriy Zaporozhets
e3c30bf2e8
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-11 16:32:11 +02:00
Stan Hu
e20529cec4
Bump rouge to 1.10.1
2015-09-10 13:38:43 -07:00
Douwe Maan
a6997e339b
Merge branch 'master' into dashboard-titles
2015-09-10 13:13:01 +01:00
Valery Sizov
381180bc27
remove gitlab_ci config
2015-09-10 13:42:41 +03:00
Robert Speicher
a81ce718c7
Merge branch 'rouge-patch' into 'master'
...
Fix highlighting of deleted lines in diffs.
Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498
Only needed until https://github.com/jneen/rouge/pull/297 is merged into
Rouge and the gem is updated in GitLab.
Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an
option, since `gollum-lib` has `rouge` as a dependency, so it would get
included anyway, and which code we'd get would depend on the load order.
See merge request !1267
2015-09-09 18:37:45 +00:00
Kamil Trzcinski
0d66d4d342
Fix reading session_expire_delay when application settings are not yet created and migrations are not yet done
2015-09-09 15:31:40 +01:00
Douwe Maan
d3730b0713
Fix highlighting of deleted lines in diffs.
2015-09-09 14:54:34 +01:00
Dmitriy Zaporozhets
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
Douwe Maan
00ecacf8ea
Add to docs
2015-09-09 11:54:48 +01:00
Douwe Maan
9c6ed29664
Expand explanation in config file
2015-09-09 11:36:08 +01:00
Dmitriy Zaporozhets
b05cc8bc9a
Merge branch 'global_labels' into 'master'
...
Global labels
https://dev.gitlab.org/gitlab/gitlabhq/issues/2353
See merge request !1240
2015-09-09 08:57:54 +00:00
Jared Szechy
e156f42079
FogBugz project import
2015-09-08 20:23:01 -04:00
Douwe Maan
0e9ba0a4fa
Add attributes to LDAP::Config.
2015-09-08 17:34:18 +01:00
Douwe Maan
c915e2c823
Allow configuration of LDAP attributes GitLab will use for the new user account.
2015-09-08 16:18:14 +01:00
Douwe Maan
5d785457db
Clean up overlap between dashboard and explore.
...
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-08 14:49:20 +01:00
Valery Sizov
954dd7ce87
Merge branch 'crowd' into 'master'
...
Crowd integration
https://dev.gitlab.org/gitlab/gitlabhq/issues/2217
See merge request !1228
2015-09-07 11:20:03 +00:00
Douwe Maan
662cf2cef4
Merge branch 'fix-wiki-page-history' into 'master'
...
Fix broken Wiki Page History
This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
See merge request !1232
2015-09-07 09:27:48 +00:00
Valery Sizov
57d0013090
CRUD for admin labels
2015-09-03 15:50:23 +03:00
Jacob Vosmaer
30bf2b9cc3
Avoid instance variable re-use trouble
...
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
2015-09-02 18:47:56 +02:00
Valery Sizov
3700e5a960
Crowd integration
2015-09-02 12:42:01 +03:00
Stan Hu
fbb891c8f3
Fix broken Wiki Page History
...
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01 23:29:27 -07:00
Dmitriy Zaporozhets
2ef16e7660
Merge branch 'gitlab-git-http-server' into 'master'
...
Replace grack with gitlab-git-http-server
See merge request !1229
2015-09-01 14:21:45 +00:00
Jacob Vosmaer
4027a26e7b
Replace grack with gitlab-git-http-server
2015-08-31 15:30:15 +02:00
Valery Sizov
6f785d584b
retrieving oauth token with LDAP credentials
2015-08-31 15:10:01 +03:00
Douwe Maan
843694f902
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-08-26 17:53:31 -07:00
Douwe Maan
6afd69f444
Update gitignore, change literal DB table names, fix errors, fix fontawesome
2015-08-26 17:47:18 -07:00
Douwe Maan
046b283127
Groundwork for merging CI into CE
2015-08-25 18:42:46 -07:00
Dmitriy Zaporozhets
8f68c38746
Dashboard activity as separate page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-25 14:13:04 +02:00
Robert Speicher
c52fe24c36
Merge branch 'reply-by-email-improvements' into 'master'
...
Ignore empty incoming messages (Reply by email)
We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit.
See merge request !1190
2015-08-24 21:56:07 +00:00
Douwe Maan
2088880383
Ignore empty incoming messages.
2015-08-24 10:57:35 -07:00
Stan Hu
4016a4577c
Only include base URL in OmniAuth full_host parameter
...
Closes #2335
2015-08-23 13:31:02 -07:00
Robert Speicher
Sytse Sijbrandij
Douwe Maan
Sameer Naik
Valery SizovandKamil Trzcinski
Dmitriy Zaporozhets
Stan Hu
liyakun
Jared Szechy
Valery Sizov
Jacob Vosmaer