summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/UnneededCapitalW Rubocop coprubocop/enable-unneeded-capital-w-copGrzegorz Bizon2016-06-301-3/+3
* Merge branch 'handle-redis-not-there' into 'master' Stan Hu2016-06-291-0/+36
|\
| * Handle case when Redis cache returns an empty settingStan Hu2016-06-291-2/+9
| * Fix database migrations when Redis is not runningStan Hu2016-06-291-0/+29
* | Merge branch 'rs-gitalb-com-staging' into 'master' Robert Speicher2016-06-291-0/+6
|\ \
| * | Update `Gitlab.com?` to support stagingrs-gitalb-com-stagingRobert Speicher2016-06-271-0/+6
* | | Merge branch 'cache-max-user-access-name' into 'master' Robert Speicher2016-06-291-0/+46
|\ \ \ | |_|/ |/| |
| * | Be explicit which project and user ID are memoizedStan Hu2016-06-291-0/+14
| * | Memoize the maximum access level for the author of notesStan Hu2016-06-291-0/+32
* | | Merge branch 'rubocop/enable-space-after-cops' into 'master' Robert Speicher2016-06-295-8/+8
|\ \ \
| * | | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-293-6/+6
| * | | Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-292-2/+2
* | | | Merge branch 'issue_3359_3' into 'master' Douwe Maan2016-06-291-16/+57
|\ \ \ \
| * \ \ \ Merge branch 'master' into issue_3359_3issue_3359_3Felipe Artur2016-06-29112-1071/+2472
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merge master into issue_3359_3Felipe Artur2016-06-291-6/+6
| |\ \ \ \
| | * | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-221-14/+55
| * | | | | merge master into issue_3359_3Felipe Artur2016-06-22158-933/+11458
| |\ \ \ \ \
| * | | | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-221-14/+55
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'optimize-png-image' into 'master' Jacob Schatz2016-06-291-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | optimize png images losslessly using zopflipngPeter Dave Hello2016-06-291-0/+0
| | |_|/ / | |/| | |
* | | | | Added Bugzilla as external issue tracker optionTim2016-06-291-0/+49
|/ / / /
* | | | Merge branch 'zj-workhorse-format-patch' into 'master' Robert Speicher2016-06-291-15/+3
|\ \ \ \
| * | | | Workhorse to serve email diffsZ.J. van de Weg2016-06-281-15/+3
* | | | | Add specssystem-infoJosh Frye2016-06-281-0/+17
* | | | | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' Rémy Coutable2016-06-281-12/+49
|\ \ \ \ \
| * | | | | Improve commit builds API endpoint RESTful behaviorGrzegorz Bizon2016-06-281-15/+48
| * | | | | Find all builds for commit if multiple pipelinesGrzegorz Bizon2016-06-281-2/+6
* | | | | | Use clock_gettime for all performance timestampsperformance-clock-adjustmentsYorick Peterse2016-06-281-2/+14
|/ / / / /
* | | | | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-282-0/+28
|\ \ \ \ \
| * | | | | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-272-4/+15
| * | | | | appease rubocophttp://jneen.net/2016-06-271-2/+2
| * | | | | check the tag so that an instance will pass toohttp://jneen.net/2016-06-271-1/+1
| * | | | | fix the spec, using project.change_headhttp://jneen.net/2016-06-272-3/+10
| * | | | | Revert "bump the master sha for gitlab-test!9"http://jneen.net/2016-06-271-1/+1
| * | | | | bump the master sha for gitlab-test!9http://jneen.net/2016-06-271-1/+1
| * | | | | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-271-0/+10
* | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-274-1/+135
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-272-1/+100
| |\ \ \ \ \
| | * | | | | Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-222-16/+58
| | * | | | | Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-222-1/+58
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-272-0/+35
| |\ \ \ \ \
| | * | | | | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-242-0/+35
* | | | | | | Rename Licenses API to License Templates APIDrew Blessing2016-06-271-1/+1
* | | | | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-271-0/+21
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-271-0/+21
* | | | | | | Use HTTP matchers if possibleZ.J. van de Weg2016-06-2767-1015/+1015
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-272-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed award emoji testsPhil Hughes2016-06-202-2/+1
* | | | | | Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-272-1/+6
|\ \ \ \ \ \
| * | | | | | Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-272-1/+6