Age | Commit message (Collapse) | Author | |
---|---|---|---|
2015-09-16 | Merge branch 'master' into update-mailroom | Douwe Maan | |
2015-09-16 | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | |
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | |||
2015-09-16 | Update mail_room | Douwe Maan | |
2015-09-16 | Fix models/ci/mail_service_spec.rb | Kamil Trzcinski | |
- Change Notify to Ci::Notify - Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables | |||
2015-09-15 | Remove gitlab_ci_meta from gems | Kamil Trzcinski | |
2015-09-15 | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | |
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock | |||
2015-09-15 | bump fogbugz gem | Jared Szechy | |
2015-09-15 | Use fixed version of fogbugz gem | Jared Szechy | |
This allows us to properly handle authentication errors. | |||
2015-09-09 | Fix brakeman | Dmitriy Zaporozhets | |
2015-09-09 | Fix spinach exception | Dmitriy Zaporozhets | |
2015-09-09 | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | |
2015-09-09 | fix Gemfile | Valery Sizov | |
2015-09-09 | FogBugz project import | Jared Szechy | |
2015-09-07 | Merge branch 'crowd' into 'master' | Valery Sizov | |
Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228 | |||
2015-09-02 | Crowd integration | Valery Sizov | |
2015-09-02 | Update mail_room to 0.4.2 for better error handling | Douwe Maan | |
2015-08-31 | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server | Jacob Vosmaer | |
2015-08-31 | Replace grack with gitlab-git-http-server | Jacob Vosmaer | |
2015-08-27 | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files | Stan Hu | |
Closes https://github.com/gitlabhq/gitlabhq/issues/9577 | |||
2015-08-27 | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | |
2015-08-26 | Update mail_room | Douwe Maan | |
2015-08-26 | Groundwork for merging CI into CE | Douwe Maan | |
2015-08-24 | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode | Stan Hu | |
Closes #2271 | |||
2015-08-20 | Use canonical version of mail_room. | Douwe Maan | |
2015-08-19 | Changes and stuff. | Douwe Maan | |
2015-08-19 | Reply by email POC | Douwe Maan | |
2015-08-18 | Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules | Stan Hu | |
Closes #2262 | |||
2015-08-15 | Bump omniauth-saml to 1.4.1 | Robert Speicher | |
Updates a vulnerable `ruby-saml` dependency. - https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448 - https://github.com/onelogin/ruby-saml/pull/247 | |||
2015-08-14 | Update Flowdock integration to support new Flowdock API | Boyan Tabakov | |
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. | |||
2015-08-11 | update gitlab_git | Valery Sizov | |
2015-08-11 | link to the local gitlab_git | Valery Sizov | |
2015-08-10 | Fix corrupted binary files when using API files endpoint | Stan Hu | |
Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219 | |||
2015-07-29 | Replace Rugments with Rouge | Stefan Tatschner | |
I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review! | |||
2015-07-28 | Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network ↵ | Stan Hu | |
graphs Closes #745 | |||
2015-07-18 | Only load byebug on MRI | Yorick Peterse | |
This Gem relies on MRI specific debugging APIs. This at least allows installation on Rubinius/JRuby. | |||
2015-07-10 | Bump coveralls version, remove explicit rest-client dependency | Robert Speicher | |
2015-07-07 | Bump capybara to 2.4.0 | Robert Speicher | |
2015-07-07 | Bump select2-rails version | Robert Speicher | |
2015-07-02 | Merge branch 'rs-gem-security' into 'master' | Dmitriy Zaporozhets | |
Gem updates for security issues - sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency) See merge request !915 | |||
2015-07-01 | Merge branch 'k-devise' into 'master' | Job van der Voort | |
added note about Devise Added note about the authentication gem used in GitLab Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q See merge request !912 | |||
2015-07-01 | Gem updates for security issues | Robert Speicher | |
- sprockets (rails dependency, but we need to specify a version to pull in fixes) - sass-rails (no security issues, but required an update to meet new sprockets version requirement) - rest-client (coveralls dependency) | |||
2015-07-01 | Bump Redcarpet to 3.3.2 | Robert Speicher | |
Closes #1911 | |||
2015-06-30 | fixed note | karen Carias | |
2015-06-30 | added note about Devise | karen Carias | |
2015-06-30 | Merge branch 'fix-c-prototype-highlighting' into 'master' | Stan Hu | |
Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902 | |||
2015-06-29 | Bump rugments to v1.0.0beta8 to fix C prototype function highlighting | Stan Hu | |
Closes #1890 | |||
2015-06-26 | Add Fuubar gem | Robert Speicher | |
2015-06-22 | Bump database_cleaner to ~> 1.4.0 | Robert Speicher | |
2015-06-22 | Bump rspec to 3.3.0 | Robert Speicher | |
2015-06-22 | Update email_spec gem | Robert Speicher | |
This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used |