| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Revert "Increase timeout for Git-over-HTTP requests." | Dmitriy Zaporozhets | 2015-03-19 | 1 | -3/+0 |
| | | | | | | | | This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9. Conflicts: Gemfile | ||||
| * | Bump gitlab_git to 7.1.2 | Dmitriy Zaporozhets | 2015-03-18 | 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 | ||||
| | * | Update semantic-ui-sass to 1.8 | yglukhov | 2015-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | Add a commit calendar to the user profile | Hannes Rosenögger | 2015-01-29 | 1 | -0/+3 |
| |/ | |||||
| * | Upgrade Sidekiq to 3.3 | Vinnie Okada | 2015-01-21 | 1 | -1/+1 |
| | | |||||
| * | Replace highlight.js with rouge-fork rugments | Stefan Tatschner | 2015-01-15 | 1 | -0/+1 |
| | | | | | | | | | | | I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same. | ||||
| * | Updated gollum-libs | Stefan Tatschner | 2015-01-15 | 1 | -1/+1 |
| | | | | | | | I did this commit in an earlier revision of my pull request. As reverting this commit later caused failing tests I decided to include it again. | ||||
| * | doorkeeper update | Valery Sizov | 2015-01-13 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'github_importer' | Dmitriy Zaporozhets | 2015-01-13 | 1 | -0/+2 |
| |\ | | | | | | | | | Conflicts: app/helpers/projects_helper.rb | ||||
| | * | Github Importer | Valery Sizov | 2015-01-10 | 1 | -0/+2 |
| | | | |||||
| * | | Fix git blame on file not respecting branch selection | Dmitriy Zaporozhets | 2015-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'easy-dev-install' into 'master' | Dmitriy Zaporozhets | 2015-01-11 | 1 | -1/+1 |
| |\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | Easy dev install @jeroenvanbaarsen just tried the following: 1. Removing therubyracer from gemfile 2. Install node (brew install node or sudo apt-get install nodejs) 3. Run $ spinach features/ All worked as before, so this would mean people have to install the node dependency on their local machine, but in my experience this is much easier than installing libv8, especially for non ruby-devs. /cc @jacobvosmaer See merge request !262 | ||||
| | * | Require the ruby racer only in production since installing it on dev ↵easy-dev-install | Sytse Sijbrandij | 2014-12-15 | 1 | -1/+1 |
| | | | | | | | | | machines can cause a lot of problems. Hat tip to Jeroen van Baarsen | ||||
| * | | Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-01-06 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | chulkilee-ruby-2.2.0 | ||||
| | * | | Update gems for ruby 2.2.0 | Chulki Lee | 2014-12-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix deleted file display when using new gitlab_git gem, and add new ↵ | Arif Ali | 2014-12-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | gitlab_git gem | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |