| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'rs-remove-slim' into 'master' | Dmitriy Zaporozhets | 2015-10-10 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | Remove slim Closes #2897 See merge request !1537 | ||||
| | * | Remove slimrs-remove-slim | Robert Speicher | 2015-10-08 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'rs-update-whenever' into 'master' | Dmitriy Zaporozhets | 2015-10-10 | 1 | -3/+0 |
| |\ \ | |/ |/| | | | | | | | | | Remove whenever gem Closes #2879 See merge request !1538 | ||||
| | * | Just kidding, we're deleting whenever entirelyrs-update-whenever | Robert Speicher | 2015-10-08 | 1 | -3/+0 |
| | | | |||||
| | * | Update whenever to ~> 0.9.4 | Robert Speicher | 2015-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'rs-update-slack-notifier' into 'master' | Dmitriy Zaporozhets | 2015-10-08 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Update slack-notifier to ~> 1.2.0 Closes #2826 See merge request !1533 | ||||
| | * | | Update slack-notifier to ~> 1.2.0rs-update-slack-notifier | Robert Speicher | 2015-10-07 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'rs-update-tinder' into 'master' | Dmitriy Zaporozhets | 2015-10-08 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Update tinder to ~> 1.10.0 Closes #2823 See merge request !1534 | ||||
| | * | | Update tinder to ~> 1.10.0rs-update-tinder | Robert Speicher | 2015-10-07 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'rs-update-rack-cors' into 'master' | Dmitriy Zaporozhets | 2015-10-08 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | Update rack-cors to ~> 0.4.0 Closes #2800 See merge request !1536 | ||||
| | * | | Update rack-cors to ~> 0.4.0 | Robert Speicher | 2015-10-07 | 1 | -3/+3 |
| | |/ | |||||
| * | | Update haml-rails to ~> 0.9.0rs-update-haml-rails | Robert Speicher | 2015-10-07 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'rs-update-omniauth-gems' into 'master' | Dmitriy Zaporozhets | 2015-10-07 | 1 | -13/+13 |
| |\ | | | | | | | | | | | | | | | | | | | Update omniauth-* gem dependencies - twitter to `~> 1.2.0` - closes #2763 - kerberos to `~> 0.3.0` - closes #2792 - google-oauth2 to `~> 0.2.0` - shibboleth to `~> 1.2.0` - closes #2791 See merge request !1526 | ||||
| | * | Update omniauth-shibboleth to ~> 1.2.0rs-update-omniauth-gems | Robert Speicher | 2015-10-06 | 1 | -2/+2 |
| | | | |||||
| | * | Loosen omniauth-google-oauth2 to ~> 0.2.0 | Robert Speicher | 2015-10-06 | 1 | -1/+1 |
| | | | |||||
| | * | Update omniauth-kerberos to ~> 0.3.0 | Robert Speicher | 2015-10-06 | 1 | -1/+1 |
| | | | |||||
| | * | Update omniauth-twitter to ~> 1.2.0 | Robert Speicher | 2015-10-06 | 1 | -12/+12 |
| | | | |||||
| * | | Add directory feature button | Stan Hu | 2015-10-07 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557 | ||||
| * | Added benchmark-ips to the Gemfile | Yorick Peterse | 2015-10-02 | 1 | -0/+2 |
| | | | | | | This allows me to use this Gem for benchmarking without having to add/remove it every time. | ||||
| * | Update gitlab_git to 7.2.17. | Douwe Maan | 2015-10-01 | 1 | -1/+1 |
| | | |||||
| * | Use after_commit_queue to schedule import job immediately | Stan Hu | 2015-09-25 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'update-mailroom' into 'master' | Robert Speicher | 2015-09-24 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Update mailroom to 0.5.2 Fixes #2698 and #2711. See merge request !1424 | ||||
| | * | Update mail_room | Douwe Maan | 2015-09-24 | 1 | -1/+1 |
| | | | |||||
| * | | Add the newrelic-grape gemnewrelic-grape | Jacob Vosmaer | 2015-09-24 | 1 | -0/+1 |
| |/ | | | | This allows us to see a breakdown of API requests in New Relic. | ||||
| * | Add links to first and/or last page with kaminari | Zeger-Jan van de Weg | 2015-09-23 | 1 | -1/+1 |
| | | | | | Also update Kaminari gem to the latest version | ||||
| * | Bump devise-two-factor to 2.0.0rs-bump-two-factor | Robert Speicher | 2015-09-19 | 1 | -1/+1 |
| | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43 | ||||
| * | Bump devise to 3.5.2 | Robert Speicher | 2015-09-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into update-mailroom | Douwe Maan | 2015-09-16 | 1 | -81/+116 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 |
| | |\ | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | ||||
| | * | | Fix models/ci/mail_service_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | - Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables | ||||
| | * | | Remove gitlab_ci_meta from gems | Kamil Trzcinski | 2015-09-15 | 1 | -2/+0 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2015-09-15 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock | ||||
| | * | | | Fix brakeman | Dmitriy Zaporozhets | 2015-09-09 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix spinach exception | Dmitriy Zaporozhets | 2015-09-09 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 1 | -7/+7 |
| | |\ \ \ | |||||
| | * | | | | fix Gemfile | Valery Sizov | 2015-09-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | 2015-08-26 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | * | | | | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 1 | -79/+115 |
| | | | | | | | |||||
| * | | | | | | Update mail_room | Douwe Maan | 2015-09-16 | 1 | -1/+1 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | bump fogbugz gem | Jared Szechy | 2015-09-15 | 1 | -1/+1 |
| | |_|_|/ |/| | | | |||||
| * | | | | Use fixed version of fogbugz gem | Jared Szechy | 2015-09-15 | 1 | -1/+1 |
| | |_|/ |/| | | | | | | | | This allows us to properly handle authentication errors. | ||||
| * | | | FogBugz project import | Jared Szechy | 2015-09-08 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge branch 'crowd' into 'master' | Valery Sizov | 2015-09-07 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228 | ||||
| | * | | | Crowd integration | Valery Sizov | 2015-09-02 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Update mail_room to 0.4.2 for better error handling | Douwe Maan | 2015-09-02 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files | Stan Hu | 2015-08-27 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577 | ||||
| * | | | Replace grack with gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 1 | -5/+0 |
| |/ / | |||||
| * | | Update mail_roomupdate-mail-room | Douwe Maan | 2015-08-26 | 1 | -1/+1 |
| | | | |||||
| * | | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode | Stan Hu | 2015-08-23 | 1 | -1/+1 |
| |/ | | | | Closes #2271 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |