- 12 Apr, 2015 8 commits
-
-
Ben Bodenmiller authored
[ci skip]
-
Dmitriy Zaporozhets authored
Prevent arbitary local repos from being imported. Fixes gitlab/gitlab-ee#263. See merge request !1763
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Fix persistent XSS vulnerability around profile website URLs. Fixes gitlab/gitlab-ee#268 See merge request !1761
-
Dmitriy Zaporozhets authored
Upon successful login, clear `reset_password_token` field Closes #1942 See merge request !1757
-
Dmitriy Zaporozhets authored
Rename all uses of Buildbox to Buildkite Closes #2214 See merge request !1759
-
Robert Schilling authored
Fix typo See merge request !511
-
Stan Hu authored
-
- 11 Apr, 2015 9 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
Bump gitlab-shell Fix git over ssh errors 'fatal: protocol error: bad line length character' Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @patricio See merge request !506
-
- 10 Apr, 2015 12 commits
-
-
Dmitriy Zaporozhets authored
Fix event-title max-width in the dashboard
-
Dmitriy Zaporozhets authored
Include creator_id in project info of API
-
Christoph Dreis authored
-
Dmitriy Zaporozhets authored
-
Christoph Dreis authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Revert "Preload lib/" This reverts commit 5511a731. The original commit added this because it also enabled threadsafety, a change which was itself later reverted in 66d6c809, but this got left behind. I don't fully understand the reasoning behind it so if I'm wrong, please tell me. My reasoning for reverting it is that it messes with Rails' (and by extension Spring's) class reloading during development. When I was working in `lib/gitlab/markdown` and had to stop and restart the server every time I made a change, I didn't know it at the time, but this was why. That was a huge pain point. If it's needed for production perhaps we could add a `if Rails.env.production?` clause around it so that it doesn't mess with development. See merge request !1758
-
Dmitriy Zaporozhets authored
Update redcarpet to 3.2.3 Closes #2211 See merge request !1756
-
Douwe Maan authored
Fix broken file browsing with a submodule that has a relative link ## What does this MR do? This MR fixes an error that occurs when browsing a submodule with a relative link. ### Are there points in the code the reviewer needs to double check? I re-wrote the function because I was confused by how the first one was supposed to work. Please review if it's clearer. ### Why was this MR needed? A 500 Error would occur when using the file browser on a repo with a submodule. Here's how to reproduce the bug: 1. Start a new project in GitLab. 2. Clone git://git.gniibe.org/gnuk/gnuk.git/ locally. 3. Push repo to new project. 4. Click on "Files" in the project. The .gitmodules file: ``` [submodule "chopstx"] path = chopstx url = ../../chopstx/chopstx.git ``` ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? 1. #775 2. #1385 3. https://github.com/gitlabhq/gitlabhq/issues/8153 4. https://github.com/gitlabhq/gitlabhq/issues/8881 5. https://github.com/gitlabhq/gitlabhq/issues/7554 See merge request !508
-
Douwe Maan authored
Move current user to the top of the list in author/assignee filter ### What does this MR do? This MR puts the current user at the top of the user list in the author/assignee filters. ### Are there points in the code the reviewer needs to double check? Is it best to do this in the JavaScript as it is in this MR, or are we better off adding an argument to the `/users` API to put the current user on top? Also, I elected to put the current user after "Any" and "Unassigned"--it looked better. Do you agree? ### Why was this MR needed? If you're trying to look for "Me" in the list, often you have to scroll down a long way to find yourself. Using the filter to find yourself is yet another step requiring the keyboard, and it's easy to forget that feature is available. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1321 and #1396 ### Screenshots Before: ![Screen_Shot_2015-04-08_at_11.18.44_PM](https://gitlab.com/stanhu/gitlab-ce/uploads/4c28ae5a3a51a8329c806ecfbc549071/Screen_Shot_2015-04-08_at_11.18.44_PM.png) After: ![Screen_Shot_2015-04-08_at_11.20.06_PM](https://gitlab.com/stanhu/gitlab-ce/uploads/ff3b8bdf38467236edbcc29401cd1235/Screen_Shot_2015-04-08_at_11.20.06_PM.png) See merge request !505
-
Stan Hu authored
Closes #775
-
- 09 Apr, 2015 11 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
This option defaults to true in RedCarpet 3.2.0, but we handle sanitization later in the process with html-pipeline. Closes #2211
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
These files don't match their naming convention, but for organizational purposes it makes sense.
-
Robert Speicher authored
-
Robert Speicher authored
Lets Rails autoload these files by name
-
Robert Speicher authored
This reverts commit 5511a731.
-
Dmitriy Zaporozhets authored
Project fork on CI side https://dev.gitlab.org/gitlab/gitlab-ci/issues/187 !!! GitLab CI side MR - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/56 See merge request !499
-
Valery Sizov authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-