- 19 May, 2016 1 commit
-
-
Sean McGivern authored
It's possible to construct a commit graph where the output of `git log` isn't in timestamp order. Grouping the commits in the list by date then gives dramatically wrong results. Instead, go for the more pragmatic approach: use the commits in the order they're given, and just show the date line each time the date changes. This means that the same date header can show up multiple times, but at least the ordering is preserved.
-
- 18 May, 2016 7 commits
-
-
Sean McGivern authored
`Gitlab::Git::Compare` will already have the correct order; sorting in Ruby can only ruin that. (The correct order being the same as `git log` - reverse chronological while maintaining the commit graph.) As an example, imagine a branch where someone has their system clock set wrong for some of the commits. Not only will those commits be in the wrong order - which is maybe reasonable - but sorting in Ruby can also put commits with the same timestamp out of order, as Ruby's sorting isn't stable.
-
Rémy Coutable authored
Clean up the images from GitLab CI Closes #17568 See merge request !4163
-
Dmitriy Zaporozhets authored
Remove bottom margin for flash message on home page ### Flash Messages Remove `margin-bottom: 16px` from `.no-ssh-key-message` and `.project-limit-message`. This added an unnecessary margin between the notification and the content which was brought up in this issue #14797. ### Affected files: ./app/assets/javascripts/project.js.coffee: $(@).parents('.no-ssh-key-message').remove() ./app/assets/stylesheets/pages/projects.scss:.no-ssh-key-message, .project-limit-message { ./app/views/shared/_no_ssh.html.haml: .no-ssh-key-message.alert.alert-warning.hidden-xs ./app/assets/javascripts/user.js.coffee: $('.hide-project-limit-message').on 'click', (e) -> ./app/assets/javascripts/user.js.coffee: $(@).parents('.project-limit-message').remove() ./app/assets/stylesheets/pages/projects.scss:.no-ssh-key-message, .project-limit-message { ./app/views/shared/_project_limit.html.haml: .project-limit-message.alert.alert-warning.hidden-xs ./app/views/shared/_project_limit.html.haml: = link_to 'Remind later', '#', class: 'hide-project-limit-message alert-link' ### Screenshots: #### Before: ![Screen_Shot_2016-05-16_at_11.45.17_PM](/uploads/35f9db16526830e49bc302e2d00ecf7e/Screen_Shot_2016-05-16_at_11.45.17_PM.png) #### After: ![Screen_Shot_2016-05-16_at_11.38.24_PM](/uploads/b8f9ac29b574a99c962c52028f7e61dd/Screen_Shot_2016-05-16_at_11.38.24_PM.png) See merge request !4173
-
Rémy Coutable authored
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Create import data in service and fix timing issues when scheduling job Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376 See merge request !4106
-
Rémy Coutable authored
Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
-
Felipe Artur authored
-
- 17 May, 2016 4 commits
-
-
Robert Speicher authored
fix typo making gitlab.com importing to fail Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4181
-
James Lopez authored
-
James Lopez authored
-
Carlos Feliciano authored
-
- 16 May, 2016 28 commits
-
-
Rémy Coutable authored
Instrument all Grape API helpers This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99). See merge request !4169
-
Yorick Peterse authored
-
Dmitriy Zaporozhets authored
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
-
Douwe Maan authored
Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
-
Douwe Maan authored
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
-
Douwe Maan authored
Disallow search engines from indexing uploads from a GitLab project. This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551. cc: @DouweM See merge request !4167
-
Rémy Coutable authored
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
-
Rémy Coutable authored
Add tests for unintentional filtering bug in MR !3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues. This MR has complementary tests for MR list. See merge request !4154
-
Connor Shea authored
This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.
-
Felipe Artur authored
-
Robert Speicher authored
Remove unused methods from Event model
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
These get escaped automatically.
-
Robert Speicher authored
Prior, the `title` attribute was being included as an argument to the route helper rather than as an argument to `link_to`.
-
Robert Speicher authored
-
Robert Speicher authored
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.
-
Felipe Artur authored
-
Douwe Maan authored
Merge branch '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
-
Robert Speicher authored
Merge branch '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
-
Felipe Artur authored
-
Felipe Artur authored
-
Felipe Artur authored
-
Felipe Artur authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Douwe Maan authored
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
-
Douwe Maan authored
-
Takuya Noguchi authored
-