summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* 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
* 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>
* | | Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+1
| |/ |/| | | | | | | Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-031-44/+0
|\ \
| * | Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-storeKamil Trzcinski2015-07-311-44/+0
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-291-8/+17
|\ \ \ | |/ / | | | | | | backup-archive-permissions
| * | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-8/+17
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-274-2/+7
|\ \ \ | |/ / | | | | | | backup-archive-permissions
| * | Merge branch 'set-omniauth-full-host' into 'master'Marin Jankovski2015-07-201-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set OmniAuth full_host parameter to ensure redirect URIs are correct ### What does this MR do? This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host. ### Why was this MR needed? [OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com), omniauth will use the internal URL (e.g. http://my-host:8080) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start. ### What are the relevant issue numbers? Closes #1967 See merge request !991
| | * | Set OmniAuth full_host parameter to ensure redirect URIs are correctStan Hu2015-07-171-0/+1
| | | | | | | | | | | | | | | | Closes #1967
| * | | Fix OAuth provider bug where GitLab would not go return to the redirect_uri ↵Stan Hu2015-07-181-1/+2
| |/ / | | | | | | | | | | | | | | | after sign-in Closes #1612
| * | Merge branch 'add-support-remove-milestone' into 'master'Stan Hu2015-07-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for destroying project milestones ### What does this MR do? This MR adds a "Remove" button to the project milestones page and the milestone page itself. ### Why was this MR needed? Because lots of people talked about needing to clean their toilets. :) ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/1504 ### Screenshots ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef8c7a3ea1db7b37cccae3869ac4de0a/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/33eb01c7bc30fb235de96db5efb8746d/image.png) See merge request !980
| | * | Add support for destroying project milestonesStan Hu2015-07-171-1/+1
| | |/ | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
| * | Expire Rails cache entries after two weeksJacob Vosmaer2015-07-151-0/+1
| |/ | | | | | | This should help prevent endless Redis growth.
| * Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+1
| |
| * Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove weird trailing charactersJacob Vosmaer2015-07-241-1/+1
| |
* | Use a separate backup test directory and nuke its contentsJacob Vosmaer2015-07-241-0/+2
| |
* | Allow custom backup archive permissionsJacob Vosmaer2015-07-062-0/+2
|/ | | | | This change helps system administrators who want to replicate GitLab backup files without needing root permissions.
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-061-1/+1
|\ | | | | | | | | | | | | | | Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
| * Audit log for user authenticationValery Sizov2015-07-061-1/+1
| |
* | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+1
|/ | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9381
* Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor admin user pageDmitriy Zaporozhets2015-06-221-0/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use explicit if.Marin Jankovski2015-06-161-2/+3
|
View Lorry Controller Status