delta/gitlab/gitlab-ce.git/Gemfile, branch update_gitlab_git gitlab.com: gitlab-org/gitlab-ce.git Replace Rugments with Rouge 2015-07-29T05:40:58+00:00 Stefan Tatschner stefan@sevenbyte.org 2015-06-28T18:45:40+00:00 f736721c5bb8f1f6031d36cc726cbd11cc499a72 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! 
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!
Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network graphs 2015-07-28T16:47:30+00:00 Stan Hu stanhu@gmail.com 2015-07-28T15:07:25+00:00 c22b4061c2136c57a30b96a886688d49ecd88193 Closes #745 
Closes #745
Only load byebug on MRI 2015-07-18T12:08:59+00:00 Yorick Peterse yorickpeterse@gmail.com 2015-07-12T20:46:51+00:00 58b94be9a7e97112755041e30559ebc2ca0a8b1d This Gem relies on MRI specific debugging APIs. This at least allows installation on Rubinius/JRuby. 
This Gem relies on MRI specific debugging APIs. This at least allows
installation on Rubinius/JRuby.
Bump coveralls version, remove explicit rest-client dependency 2015-07-09T22:35:40+00:00 Robert Speicher rspeicher@gmail.com 2015-07-09T22:35:40+00:00 b50bfcc61965b71a66df21964d7d98b50c5f8d19 






Bump capybara to 2.4.0
2015-07-07T02:39:55+00:00

Robert Speicher
rspeicher@gmail.com

2015-07-06T23:50:36+00:00

ea565653a06125689cf30326bacfae812e1f2800












Bump select2-rails version
2015-07-07T02:39:55+00:00

Robert Speicher
rspeicher@gmail.com

2015-06-24T21:13:21+00:00

9e53ad5e2075640440b90fa5ee7e9951bbd28dac












Merge branch 'rs-gem-security' into 'master'
2015-07-02T08:25:18+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-07-02T08:25:18+00:00

2cbf45282168938696867072cb3e35131bc44a93

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





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







Merge branch 'k-devise' into 'master'
2015-07-01T08:46:26+00:00

Job van der Voort
job@gitlab.com

2015-07-01T08:46:26+00:00

d18f1ce75d156c20aeb306a3021dad3674a667d3

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





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







Gem updates for security issues
2015-07-01T01:38:26+00:00

Robert Speicher
rspeicher@gmail.com

2015-07-01T01:38:26+00:00

3078b13e7248d5f0df1e1093ebfb8f401d234784

- 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)





- 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)







Bump Redcarpet to 3.3.2
2015-06-30T22:18:51+00:00

Robert Speicher
rspeicher@gmail.com

2015-06-30T22:18:51+00:00

c5b9d4720e2924065e6eaf8479db274b8233078e

Closes #1911





Closes #1911