- 15 Apr, 2015 2 commits
-
-
Douwe Maan authored
Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab (
♥ @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471 -
Robert Schilling authored
Remove timing dependency on unsubscribe merge request test This test failed for me once. I am now on a mission to remove `sleep` from the spinach tests. See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara See merge request !523
-
- 14 Apr, 2015 32 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Fix ldap migration We need different queries for MySQL and Postgres. See merge request !1771
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Ui improvements See merge request !1772
-
Douwe Maan authored
Fix error message This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback. See merge request !518
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Jacob Vosmaer authored
I could not help myself
-
Jacob Vosmaer authored
I could not find a query that worked on both; these two queries look very similar and seem to do the same thing.
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Fix directory traversal vulnerabilities Fixes gitlab/gitlab-ee#272. As @joern mentions: > This is not exploitable via the front-end nginx. But nevertheless this issue should be addressed. See merge request !1760
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Allow user to choose which email to be public
-
Senorsen authored
This commit allows user to show one of their emails in profile page, or don't show email in this page.
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
This reverts commit 79b4d0b0, reversing changes made to a1e147ce.
-
Dmitriy Zaporozhets authored
-
Douwe Maan authored
Revert "Merge branch 'fix_email_images' into 'master'" This reverts commit d66148ef, reversing changes made to cdb64a81. This change needed to be reverted, because not enough email clients support inline images. /cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;) See merge request !513
-
Zbigniew Motyka authored
-
Douwe Maan authored
Fix wrong merged changelog entries See merge request !514
-
Douwe Maan authored
fix stuck MR If `locked_at` is `nil` return that the merge has been locked long enough and those are old merges stuck in locked state. Fixes #348. Related to 64874193. See merge request !517
-
Dmitriy Zaporozhets authored
Remove the invalid key factories They're only used once each, and they're easy to build in-place. See merge request !1766
-
Dmitriy Zaporozhets authored
Speed up the overridden `link_to` helper Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character. See merge request !1767
-
Ben Bodenmiller authored
fixes #348. related to 64874193.
-
- 13 Apr, 2015 6 commits
-
-
Hannes Rosenögger authored
fix failing test This should fix: ``` Coverage report generated for RSpec to /home/gitlab-runner/tmp/builds/project-1/coverage. 4331 / 8315 LOC (52.09%) covered. /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/racc-1.4.10/lib/racc/parser.rb:532:in `on_error': (Racc::ParseError) parse error on value "Background" (BACKGROUND) from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/racc-1.4.10/lib/racc/parser.rb:264:in `_racc_do_parse_c' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/racc-1.4.10/lib/racc/parser.rb:264:in `do_parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/gherkin-ruby-0.3.1/lib/gherkin_ruby/parser/lexer.rb:31:in `scan_str' from gherkin.y:107:in `parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/gherkin-ruby-0.3.1/lib/gherkin_ruby.rb:8:in `parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/parser.rb:39:in `parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/runner.rb:75:in `block in run' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/runner.rb:74:in `each' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/runner.rb:74:in `run' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/cli.rb:27:in `run' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/bin/spinach:15:in `<top (required)>' from /home/gitlab-runner/bin/spinach:23:in `load' from /home/gitlab-runner/bin/spinach:23:in `<main>' rake aborted! ``` Seems that I deleted a bit to much with my last attempt to remove the failing test. I've run the entire spinach suite again locally and it seems to pass. See merge request !516
-
Hannes Rosenögger authored
-
Douwe Maan authored
Remove failing test Earlier today I accepted a MR that removed the redundant help link on the dashboard sidebar. This MR removes the now failing test. See merge request !515
-
Hannes Rosenögger authored
-
Hannes Rosenögger authored
Explicitly set image alt to prevent graphical glitches Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de> See merge request !503
-
Sven Strickroth authored
Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de>
-