| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Bump devise-two-factor to 2.0.0rs-bump-two-factor | Robert Speicher | 2015-09-19 | 1 | -5/+4 |
| | | | | | | | 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 | -3/+9 |
| | | |||||
| * | Fix 500 when accessing private project when not logged infix-ci-non-public-project | Kamil Trzcinski | 2015-09-17 | 1 | -3/+0 |
| | | |||||
| * | Merge branch 'update-mailroom' into 'master' | Robert Speicher | 2015-09-16 | 1 | -2/+2 |
| |\ | | | | | | | See merge request !1306 | ||||
| | * | Fix Gemfile.lock | Douwe Maan | 2015-09-16 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into update-mailroom | Douwe Maan | 2015-09-16 | 1 | -236/+275 |
| | |\ | |||||
| | * | | Update mail_room | Douwe Maan | 2015-09-16 | 1 | -2/+5 |
| | | | | |||||
| * | | | Fix gemfile.lock | Dmitriy Zaporozhets | 2015-09-16 | 1 | -1/+4 |
| | |/ |/| | |||||
| * | | 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 | -3/+3 |
| |\ \ | |/ | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | ||||
| | * | bump fogbugz gem | Jared Szechy | 2015-09-15 | 1 | -2/+2 |
| | | | |||||
| * | | Fix models/ci/mail_service_spec.rb | Kamil Trzcinski | 2015-09-15 | 1 | -9/+9 |
| | | | | | | | | | | | - 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/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2015-09-15 | 1 | -9/+5 |
| |\ \ | |/ | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock | ||||
| | * | Use fixed version of fogbugz gem | Jared Szechy | 2015-09-15 | 1 | -3/+3 |
| | | | | | | | | | This allows us to properly handle authentication errors. | ||||
| | * | Update gitlab_emoji to 0.1.1 | Robert Schilling | 2015-09-14 | 1 | -5/+2 |
| | | | |||||
| * | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-11 | 1 | -2/+2 |
| |\ \ | |/ | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Bump rouge to 1.10.1 | Stan Hu | 2015-09-10 | 1 | -2/+2 |
| | | | |||||
| | * | Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ↵ | Stan Hu | 2015-09-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | bugs Closes #2128 Closes #2433 | ||||
| * | | Fix brakeman | Dmitriy Zaporozhets | 2015-09-09 | 1 | -4/+4 |
| | | | |||||
| * | | Fix spinach exception | Dmitriy Zaporozhets | 2015-09-09 | 1 | -1/+2 |
| | | | |||||
| * | | 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/+15 |
| |\ \ | |/ | |||||
| | * | FogBugz project import | Jared Szechy | 2015-09-08 | 1 | -0/+6 |
| | | | |||||
| | * | Merge branch 'crowd' into 'master' | Valery Sizov | 2015-09-07 | 1 | -0/+5 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228 | ||||
| | | * | Crowd integration | Valery Sizov | 2015-09-02 | 1 | -0/+5 |
| | | | | |||||
| | * | | Update mail_room to 0.4.2 for better error handling | Douwe Maan | 2015-09-02 | 1 | -2/+5 |
| | |/ | |||||
| | * | Merge branch 'gitlab-git-http-server' into 'master' | Dmitriy Zaporozhets | 2015-09-01 | 1 | -6/+0 |
| | |\ | | | | | | | | | | | | | | | | Replace grack with gitlab-git-http-server See merge request !1229 | ||||
| | | * | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 1 | -2/+2 |
| | | |\ | |||||
| | | * | | Replace grack with gitlab-git-http-server | Jacob Vosmaer | 2015-08-31 | 1 | -6/+0 |
| | | | | | |||||
| | * | | | Merge branch 'master' into 'master' | Valery Sizov | 2015-09-01 | 1 | -1/+1 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Update Racc to 1.4.12 The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option. See merge request !1201 | ||||
| | | * | | Update Racc to 1.4.12 | Yorick Peterse | 2015-08-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | This ensures GitLab can actually run Rubinius, previously it would segfault in Racc during the bootup phase. | ||||
| | * | | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files | Stan Hu | 2015-08-27 | 1 | -2/+2 |
| | | |/ | |/| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577 | ||||
| * | | | fix Gemfile | Valery Sizov | 2015-09-09 | 1 | -8/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | 2015-08-26 | 1 | -4/+4 |
| |\ \ \ | |/ / | |||||
| | * | | Update mail_roomupdate-mail-room | Douwe Maan | 2015-08-26 | 1 | -2/+2 |
| | |/ | |||||
| | * | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode | Stan Hu | 2015-08-23 | 1 | -2/+2 |
| | | | | | | | | | Closes #2271 | ||||
| * | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 1 | -250/+294 |
| |/ | |||||
| * | Use canonical version of mail_room. | Douwe Maan | 2015-08-20 | 1 | -8/+2 |
| | | |||||
| * | Update mail_room. | Douwe Maan | 2015-08-19 | 1 | -1/+1 |
| | | |||||
| * | Changes and stuff. | Douwe Maan | 2015-08-18 | 1 | -0/+2 |
| | | |||||
| * | Update mail_room | Douwe Maan | 2015-08-18 | 1 | -1/+1 |
| | | |||||
| * | Reply by email POC | Douwe Maan | 2015-08-18 | 1 | -0/+8 |
| | | |||||
| * | Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules | Stan Hu | 2015-08-17 | 1 | -2/+2 |
| | | | | | Closes #2262 | ||||
| * | Bump omniauth-saml to 1.4.1rs-gem-security | Robert Speicher | 2015-08-14 | 1 | -6/+6 |
| | | | | | | | | Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247 | ||||
| * | Update Flowdock integration to support new Flowdock API | Boyan Tabakov | 2015-08-14 | 1 | -3/+7 |
| | | | | | Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used. | ||||
| * | Merge branch 'optimize-haml-textarea-rendering' into 'master' | Dmitriy Zaporozhets | 2015-08-11 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Bump Haml to 4.0.7 to speed up textarea rendering The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there: https://github.com/haml/haml/pull/850 Closes #1987 See merge request !984 | ||||
| | * | Bump Haml to 4.0.7 to speed up textarea rendering | Stan Hu | 2015-08-10 | 1 | -1/+1 |
| | | | | | | | | | Closes #1987 | ||||
| * | | update gitlab_gitgrit_blame | Valery Sizov | 2015-08-11 | 1 | -10/+6 |
| | | | |||||
| * | | link to the local gitlab_git | Valery Sizov | 2015-08-11 | 1 | -7/+11 |
| | | | |||||
| * | | Merge branch 'disable-autocrlf-for-binary-files' into 'master' | Stan Hu | 2015-08-10 | 1 | -2/+2 |
| |\ \ | |/ |/| | | | | | | | | | | | Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123 | ||||
| | * | Fix corrupted binary files when using API files endpoint | Stan Hu | 2015-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/Gemfile.lock