summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-062-1/+6
|\ | | | | | | | | | | | | | | | | | | Only publish ssh key-type and key Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys) To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded. See merge request !850
| * Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-042-1/+6
| |
* | Merge branch 'tree-author-at-end' into 'master'Dmitriy Zaporozhets2015-08-062-6/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Put author name at the end of a tree row Put author name at the end of a tree row as the commit message is more important than the author name. See merge request !579
| * | Put author name at the end of a tree rowSven Strickroth2015-08-052-6/+5
| | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
| * | | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-011-3/+4
| | | | | | | | | | | | | | | | Closes #1804
* | | | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0532-242/+237
|\ \ \ \
| * | | | Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-2/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0492-308/+550
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix refresh serviceDmitriy Zaporozhets2015-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ↵Dmitriy Zaporozhets2015-07-162-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reload with full diff link Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-1617-130/+129
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-158-51/+36
| | | | |
| * | | | Implement update of ref when merge request code is reloadedDmitriy Zaporozhets2015-07-151-9/+18
| | | | |
| * | | | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-157-22/+62
| | | | |
| * | | | Remove satellitesDmitriy Zaporozhets2015-07-1514-58/+14
| | | | |
| * | | | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-152-0/+14
| | | | |
* | | | | Merge branch 'ci-skipped-status' into 'master' Kamil Trzciński2015-08-054-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for CI skipped status This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216 See merge request !1073
| * | | | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-044-2/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'revert_touch' into 'master' Sytse Sijbrandij2015-08-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Update noteable after a new note is added" This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78. https://gitlab.com/gitlab-org/gitlab-ce/issues/2027 See merge request !1094
| * | | | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
* | | | | Merge branch 'add-resend-confirm-email-admin-page' into 'master'Dmitriy Zaporozhets2015-08-052-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Confirm user" button to admin page ### What does this MR do? This MR adds a "Confirm user" to the admin user page. ### Why was this MR needed? There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state. Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set. ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0571b1e27597289b760a72948ba869e5/image.png) ### What are the relevant issue numbers? * Closes #2116 * Closes https://github.com/gitlabhq/gitlabhq/issues/9502 See merge request !1067
| * | | | | Add "Confirm user" button in user admin pageStan Hu2015-08-052-0/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
* | | | | Merge remote-tracking branch 'public/project-buttons'Dmitriy Zaporozhets2015-08-056-26/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't hide the clone holder for an empty projectproject-buttonsRobert Speicher2015-08-041-3/+3
| | | | |
| * | | | Merge branch 'master' into project-buttonsDouwe Maan2015-07-312-4/+9
| |\ \ \ \
| * | | | | Tweak project page buttons.Douwe Maan2015-07-316-26/+37
| | | | | |
* | | | | | Merge branch 'update-mr-branch-text' into 'master'Douwe Maan2015-08-041-2/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request text to reflect editability of source/target branch Screenshot 1 (source branch deleted): ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/81dfbc4c790a1bb047d60cd4699bb71f/image.png) Screenshot 2 (target branch deleted): ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/acec96c12d40175301ce4d4405137348/image.png) Closes #2134 See merge request !1085
| * | | | | Update merge request text to reflect editability of source/target branchStan Hu2015-08-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Closes #2134
* | | | | | Merge branch 'add-license'Dmitriy Zaporozhets2015-08-034-8/+68
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into add-licenseadd-licenseDouwe Maan2015-07-312-4/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix method name.Douwe Maan2015-07-301-1/+1
| | | | | |
| * | | | | Show buttons to add license, changelog and contribution guide if they're ↵Douwe Maan2015-07-303-7/+67
| | |/ / / | |/| | | | | | | | | | | | | missing.
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-025-3/+34
|\ \ \ \ \
| * | | | | Re-annotate modelsAtsushi Ishida2015-08-035-3/+34
| | |_|_|/ | |/| | |
* | | | | Make `code` elements in links display as suchrs-code-linksRobert Speicher2015-07-312-1/+5
|/ / / / | | | | | | | | | | | | Also adds some minor padding to inline `code` elements.
* | | | Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan2015-07-312-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention group and project names in flash messages upon create, update and delete. Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency. **Before** ![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png) **After** ![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png) See merge request !1070
| * | | | Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | This change was made to match the project deletion.
| * | | | Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-302-7/+7
| | | | |
* | | | | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-316-20/+33
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add specific ability for managing group members To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue) See merge request !1059
| * | | | Use before_actionsDouwe Maan2015-07-312-4/+7
| | | | |
| * | | | Restore Leave button on dashboard groups pageadmin-group-memberDouwe Maan2015-07-291-4/+3
| | | | |
| * | | | Show Leave button when you're the last owner, so that the error explains the ↵Douwe Maan2015-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | reason
| * | | | Disable adding members from admin area when appropriateDouwe Maan2015-07-281-16/+18
| | | | |
| * | | | Add specific ability for managing group membersDouwe Maan2015-07-285-7/+16
| | | | |
* | | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-302-4/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
| * | | | Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
| | | | |
| * | | | No more web urlDouwe Maan2015-07-303-12/+1
| | | | |
| * | | | Fix specsDouwe Maan2015-07-291-1/+1
| | | | |
| * | | | Merge branch 'master' into api-new-attributesDouwe Maan2015-07-295-8/+15
| |\ \ \ \
View Lorry Controller Status