| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.emailsonpush-last-line | Douwe Maan | 2015-03-31 | 1 | -1/+1 |
| | | |||||
| * | Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff ↵ | Douwe Maan | 2015-03-31 | 1 | -1/+1 |
| | | | | | being rendered as error. | ||||
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-03-29 | 1 | -1/+1 |
| |\ | |||||
| | * | update acts-as-taggable-on | Nihad Abbasov | 2015-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'fix-plain-diffs' into 'master' | Dmitriy Zaporozhets | 2015-03-29 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | | | | | | | | | | | Remove the email patches link for merge commits Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue. cc @sytse See merge request !1737 | ||||
| | * | Upgrade gitlab_git gem to version 7.1.3 | Vinnie Okada | 2015-03-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add sidetiq dependency | Vinnie Okada | 2015-03-21 | 1 | -0/+1 |
| |/ | | | | Add the sidetiq gem to the Gemfile to match EE. | ||||
| * | gollum-lib update | Valery Sizov | 2015-03-20 | 1 | -1/+1 |
| | | |||||
| * | update doorkeeper to 2.1.3 | Valery Sizov | 2015-03-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'revert-unicorn-timeout' into 'master' | Dmitriy Zaporozhets | 2015-03-20 | 1 | -3/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Revert "Increase timeout for Git-over-HTTP requests." This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. For #2164 cc @marin @douwe See merge request !1730 | ||||
| | * | Revert "Increase timeout for Git-over-HTTP requests." | Dmitriy Zaporozhets | 2015-03-19 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. Conflicts: Gemfile | ||||
| * | | Revert "Update poltergeist to support phantomjs 2.0" | Dmitriy Zaporozhets | 2015-03-19 | 1 | -1/+1 |
| |/ | | | | This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797. | ||||
| * | Merge branch 'version-bump-poltergeist' into 'master' | Dmitriy Zaporozhets | 2015-03-19 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | Update poltergeist to support phantomjs 2.0 In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK. PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md). Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further. See merge request !403 | ||||
| | * | Update poltergeist to support phantomjs 2.0 | Zeger-Jan van de Weg | 2015-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | Bump gitlab_git to 7.1.2 | Dmitriy Zaporozhets | 2015-03-18 | 1 | -1/+1 |
| |/ | |||||
| * | Update omniauth-ldap. | Douwe Maan | 2015-03-17 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'remove_rubyracer' into 'master' | Marin Jankovski | 2015-03-16 | 1 | -1/+0 |
| |\ | | | | | | | | | | | Remove rubyracer gem See merge request !1706 | ||||
| | * | Remove rubyracer gem.remove_rubyracer | Marin Jankovski | 2015-03-13 | 1 | -1/+0 |
| | | | |||||
| * | | Prevent gitlab-shell character encoding issues by receiving its changes as ↵ | Douwe Maan | 2015-03-15 | 1 | -0/+3 |
| |/ | | | | raw data. | ||||
| * | Bump gitlab_git to 7.1.1 | Dmitriy Zaporozhets | 2015-03-13 | 1 | -1/+1 |
| | | | | | Verify found object is actually a commit in Commit.find | ||||
| * | Merge branch 'master' into new-emoji | Dmitriy Zaporozhets | 2015-03-11 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: Gemfile.lock | ||||
| | * | Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues | Dmitriy Zaporozhets | 2015-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | Update html-pipeline and emoji | Dmitriy Zaporozhets | 2015-03-11 | 1 | -2/+2 |
| |/ | |||||
| * | Bump gitlab_git to fix 500 with annotated tags w/o message | Dmitriy Zaporozhets | 2015-03-05 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'timeout' into 'master' | Dmitriy Zaporozhets | 2015-03-05 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Increase timeout for Git-over-HTTP requests. Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232. Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty. The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`. See merge request !1619 | ||||
| | * | Increase timeout for Git-over-HTTP requests. | Douwe Maan | 2015-03-04 | 1 | -0/+3 |
| | | | |||||
| * | | Update spring to 1.3.3 | Dmitriy Zaporozhets | 2015-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Bump gitlab_git to rc15 | Dmitriy Zaporozhets | 2015-03-04 | 1 | -1/+1 |
| |/ | |||||
| * | Add brakeman gem | Dmitriy Zaporozhets | 2015-03-02 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'extend_markdown_upload' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Generalizes image upload in drag and drop in markdown to all files From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger. - [x] Rebase on master when !1553 is merged in See merge request !1530 | ||||
| | * | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-25 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | # Conflicts: # app/controllers/files_controller.rb | ||||
| | * \ | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-24 | 1 | -5/+2 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb | ||||
| | * | | | Refactor. | Douwe Maan | 2015-02-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'bitbucket-import' | Dmitriy Zaporozhets | 2015-02-25 | 1 | -0/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb | ||||
| | * | | | Add Bitbucket importer. | Douwe Maan | 2015-02-24 | 1 | -0/+1 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into update_grack | Dmitriy Zaporozhets | 2015-02-24 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock | ||||
| | * | | | update gitlab-linguist | Valery Sizov | 2015-02-24 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | update gitlab-grack to 2.0.0.rc2 | Valery Sizov | 2015-02-24 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #8783 from jvanbaarsen/spring-update | Dmitriy Zaporozhets | 2015-02-23 | 1 | -2/+2 |
| |\ \ | | | | | | | Updated spring | ||||
| | * | | Updated spring | Jeroen van Baarsen | 2015-02-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
| * | | | Create Aside js class for handling all sidebars in UI for mobile devices | Dmitriy Zaporozhets | 2015-02-21 | 1 | -3/+0 |
| | |/ |/| | |||||
| * | | Started on the rspec upgrade | Jeroen van Baarsen | 2015-02-12 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
| * | Merge pull request #8580 from j0k3r/asana | Dmitriy Zaporozhets | 2015-02-08 | 1 | -0/+3 |
| |\ | | | | | Add Asana service | ||||
| | * | Add Asana service | Jeremy | 2015-02-02 | 1 | -0/+3 |
| | | | | | | | | | Also add ability to render "service.help" in markdown | ||||
| * | | GitLab integration. Importer | Valery Sizov | 2015-02-05 | 1 | -0/+1 |
| | | | |||||
| * | | Add rubocop and remove rails_best_practices gem | Dmitriy Zaporozhets | 2015-02-02 | 1 | -2/+1 |
| |/ | |||||
| * | Merge pull request #8687 from tsigo/rs-pry-rails | Dmitriy Zaporozhets | 2015-01-29 | 1 | -1/+1 |
| |\ | | | | | Use pry-rails gem instead of pry | ||||
| | * | Use pry-rails gem instead of pry | Robert Speicher | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | pry-rails has pry as a dependency and this lets us have all that pry when we run `rails console` :heart: | ||||
| * | | Update shoulda-matchers | Robert Speicher | 2015-01-29 | 1 | -1/+1 |
| |/ | | | | | | | This outdated gem was the cause of those annoying MiniTest errors. Also updates one use of `ensure_inclusion_of` which was deprecated in favor of `validate_inclusion_of`. | ||||
| * | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-01-28 | 1 | -1/+1 |
| |\ | | | | | | | haynes/gitlab-ce-commit_calendar | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |