summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Update documentation and config filesKamil Trzcinski2015-09-161-3/+19
|
* Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-151-9/+21
|\ | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-0/+10
| |\ | | | | | | add "replace" and "upload" functionality
| | * Add "Replace" and "Upload" featuresliyakun2015-09-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'dashboard-titles' into 'master'Dmitriy Zaporozhets2015-09-111-9/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up overlap between dashboard and explore - Clean up overlap between dashboard and explore. ... 5d785457 - 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. - Consistently case `Back to X` links. 260fcd45 - Link to help from signin page bottom. d92696d3 - Make Help accessible for guests. c258e977 cc @dzaporozhets See merge request !1260
| | * \ Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-104-2/+42
| | |\ \ | | | |/
| | * | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-9/+11
| | | | | | | | | | | | | | | | | | | | - 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.
* | | | Revert "monkey patch of Hash"Kamil Trzcinski2015-09-141-15/+0
| | | | | | | | | | | | | | | | This reverts commit 6014019ed49295178ebd0c4ce5f6f1d210219420.
* | | | monkey patch of HashValery Sizov2015-09-141-0/+15
| | | |
* | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-141-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * \ \ \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-1/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Bump rouge to 1.10.1Stan Hu2015-09-101-24/+0
| | | |/ | | |/|
| | * | Merge branch 'rouge-patch' into 'master'Robert Speicher2015-09-091-0/+24
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Fix highlighting of deleted lines in diffs.rouge-patchDouwe Maan2015-09-091-0/+24
| | | |/
| | * | Fix reading session_expire_delay when application settings are not yet ↵Kamil Trzcinski2015-09-091-1/+6
| | | | | | | | | | | | | | | | created and migrations are not yet done
* | | | fix of APIValery Sizov2015-09-141-1/+1
|/ / /
* | | remove gitlab_ci configValery Sizov2015-09-105-150/+24
| | |
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-095-19/+33
|\ \ \ | |/ /
| * | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-091-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
| | * | CRUD for admin labelsValery Sizov2015-09-031-0/+2
| | | |
| * | | FogBugz project importJared Szechy2015-09-082-1/+10
| | |/ | |/|
| * | Merge branch 'crowd' into 'master'Valery Sizov2015-09-072-1/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| | * | Crowd integrationValery Sizov2015-09-022-1/+6
| | |/
| * | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-071-9/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fix broken Wiki Page HistoryStan Hu2015-09-011-9/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
| * | Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-1/+1
| |/ | | | | | | | | 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.
| * Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-011-6/+1
| |\ | | | | | | | | | | | | | | | Replace grack with gitlab-git-http-server See merge request !1229
| | * Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-6/+1
| | |
| * | retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-311-2/+1
| |/
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-264-8/+49
|\ \ | |/
| * Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'reply-by-email-improvements' into 'master'Robert Speicher2015-08-241-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | 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
| | * Ignore empty incoming messages.Douwe Maan2015-08-241-0/+2
| | |
| * | Only include base URL in OmniAuth full_host parameterStan Hu2015-08-232-9/+19
| |/ | | | | | | Closes #2335
* | Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan2015-08-262-22/+0
| |
* | Groundwork for merging CI into CEDouwe Maan2015-08-2523-47/+380
|/
* Merge branch 'master' into reply-by-emailDouwe Maan2015-08-202-2/+3
|\
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+1
| |
| * Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+2
| | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* | Add documentation.Douwe Maan2015-08-192-13/+26
| |
* | Changes and stuff.Douwe Maan2015-08-181-1/+1
| |
* | Reply by email POCDouwe Maan2015-08-183-0/+25
|/
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-2/+2
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-091-0/+10
|\ | | | | | | | | | | | | | | link to configured gravatar host on profile page This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service. See merge request !1093
| * ink to configured gravatar host on profile pageBen Bodenmiller2015-08-051-0/+10
| |
* | Add abuse report management in admin areaDmitriy Zaporozhets2015-08-061-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-051-2/+2
|\ \
| * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-047-54/+26
| |\ \ | | |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status