summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Updated snippets UIPhil Hughes2016-05-188-55/+118
| | | | Closes #14328
* Merge branch 'dz-fix-sidebar-overlap' into 'master' Dmitriy Zaporozhets2016-05-161-0/+2
|\ | | | | | | | | | | | | | | | | | | | | Fix left sidebar overlap when scroll on long menu Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164 cc @iamphill @jschatz1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4165
| * Fix left sidebar overlap when scroll on long menudz-fix-sidebar-overlapDmitriy Zaporozhets2016-05-161-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-165-3/+16
|\ \ | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * | fix default send confirmation valueFelipe Artur2016-05-161-1/+2
| | |
| * | Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-162-4/+4
| | |
| * | Fix changelog fileFelipe Artur2016-05-161-1/+0
| | |
| * | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-163-4/+5
| | |
| * | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-163-0/+12
| |/
* | Merge branch 'rs-event-titles' into 'master' Douwe Maan2016-05-165-64/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an Event's target's title to its reference link Given an activity feed entry like: > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce] ...the `issue #123` link will now have a `title` attribute. Plus some minor refactorings, see individual commits for details. See merge request !4090
| * | Reduce duplication and branching logic in EventsHelperRobert Speicher2016-05-163-54/+25
| | | | | | | | | | | | Remove unused methods from Event model
| * | Rename `Event#note_project_snippet?` to `project_snippet_note?`Robert Speicher2016-05-162-3/+3
| | |
| * | Rename `Event#note_commit?` to `commit_note?`Robert Speicher2016-05-162-7/+7
| | |
| * | Remove redundant `html_escape` calls from `title` attributesRobert Speicher2016-05-161-3/+3
| | | | | | | | | | | | These get escaped automatically.
| * | Fix titles for commit references in Event feedRobert Speicher2016-05-161-1/+2
| | | | | | | | | | | | | | | Prior, the `title` attribute was being included as an argument to the route helper rather than as an argument to `link_to`.
| * | Simplify Event's target type-checkingRobert Speicher2016-05-161-3/+3
| | |
| * | Add an Event's target's title to its reference linkRobert Speicher2016-05-164-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Given an activity feed entry like: > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce] ...the `issue #123` link will now have a `title` attribute.
* | | Merge branch 'wiki-fix-reloaded' into 'master' Rémy Coutable2016-05-161-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
| * | Use the relative url prefix for links in WikiArtem Sidorenko2016-05-131-1/+1
| | |
* | | Merge branch ↵Douwe Maan2016-05-162-4/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master' Make upcoming milestone work across projects Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated). Closes #17227. See merge request !4125
| * | | Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestonesSean McGivern2016-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres only needs to select a single column, so that can used as a sub-query where `Milestone.upcoming_ids_by_projects` is actually used in `IssuableFinder`. MySQL needs to select the `due_date` column because it's used in the `HAVING` clause, so it has to return an array of IDs.
| * | | Make upcoming milestone work across projectsSean McGivern2016-05-162-4/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated).
* | | Merge branch ↵Robert Speicher2016-05-161-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master' Force password change after admin reset Closes #13691. See merge request !4016
| * | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-161-0/+1
| |/ / | | | | | | | | | | | | | | | When an admin changes a user's password for them, force the user to reset the password after logging in by expiring the new password immediately.
* | | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-166-3/+187
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| * | | Fix offline_token http_status codeKamil Trzcinski2016-05-151-1/+1
| | | |
| * | | Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-151-2/+2
| | | |
| * | | Improve authentication service specsKamil Trzcinski2016-05-151-3/+3
| | | |
| * | | Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| | | |
| * | | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-143-23/+18
| | | |
| * | | Fix authentication serviceKamil Trzcinski2016-05-142-1/+8
| | | |
| * | | Add TODOKamil Trzcinski2016-05-141-0/+3
| | | |
| * | | Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
| | | |
| * | | Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-143-72/+70
| | | |
| * | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-13150-1868/+514
| |\ \ \ | | | |/ | | |/| | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
| | | |
| * | | Move JWT to Gitlab::JWTKamil Trzcinski2016-05-132-51/+53
| | | |
| * | | Fix CI testsKamil Trzcinski2016-05-122-4/+4
| | | |
| * | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-092-10/+14
| | | |
| * | | Make code more clear in what is doneKamil Trzcinski2016-05-092-13/+14
| | | |
| * | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-095-13/+18
| | | |
| * | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-09205-826/+1345
| |\ \ \
| * | | | Split docker authentication serviceKamil Trzcinski2016-05-022-101/+78
| | | | |
| * | | | Added JWT controllerKamil Trzcinski2016-05-021-0/+173
| | | | |
| * | | | Make images_enabled configurableKamil Trzcinski2016-04-292-1/+12
| | | | |
| * | | | Added authentication service for docker registryKamil Trzcinski2016-04-293-2/+12
| | | | |
* | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-163-7/+33
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-131-0/+4
| | | | |
| * | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-132-7/+29
| | |_|/ | |/| |
* | | | Change colors for charcoal and graphite sidebar themesdz-change-sidebar-colorsDmitriy Zaporozhets2016-05-141-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status