Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'issue-18886' into 'master' | Dmitriy Zaporozhets | 2016-06-30 | 1 | -1/+1 |
|\ | |||||
| * | Loop all disks when displaying system infoissue-18886 | Josh Frye | 2016-06-29 | 1 | -1/+1 |
* | | Add Application Setting to configure default Repository Path for new projectsshards-config | Alejandro Rodríguez | 2016-06-29 | 3 | -1/+33 |
* | | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shards | Alejandro Rodríguez | 2016-06-29 | 1 | -0/+23 |
* | | Refactor repository paths handling to allow multiple git mount points | Alejandro Rodríguez | 2016-06-29 | 13 | -73/+210 |
* | | Merge branch 'handle-redis-not-there' into 'master' | Stan Hu | 2016-06-29 | 1 | -0/+36 |
|\ \ | |||||
| * | | Handle case when Redis cache returns an empty setting | Stan Hu | 2016-06-29 | 1 | -2/+9 |
| * | | Fix database migrations when Redis is not running | Stan Hu | 2016-06-29 | 1 | -0/+29 |
* | | | Merge branch 'rs-gitalb-com-staging' into 'master' | Robert Speicher | 2016-06-29 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Update `Gitlab.com?` to support stagingrs-gitalb-com-staging | Robert Speicher | 2016-06-27 | 1 | -0/+6 |
* | | | | Merge branch 'cache-max-user-access-name' into 'master' | Robert Speicher | 2016-06-29 | 1 | -0/+46 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Be explicit which project and user ID are memoized | Stan Hu | 2016-06-29 | 1 | -0/+14 |
| * | | | Memoize the maximum access level for the author of notes | Stan Hu | 2016-06-29 | 1 | -0/+32 |
* | | | | Merge branch 'rubocop/enable-space-after-cops' into 'master' | Robert Speicher | 2016-06-29 | 5 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-cops | Grzegorz Bizon | 2016-06-29 | 3 | -6/+6 |
| * | | | | Enable Style/SpaceAfterColon Rubocop cops | Grzegorz Bizon | 2016-06-29 | 2 | -2/+2 |
* | | | | | Merge branch 'issue_3359_3' into 'master' | Douwe Maan | 2016-06-29 | 1 | -16/+57 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into issue_3359_3issue_3359_3 | Felipe Artur | 2016-06-29 | 112 | -1071/+2472 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | merge master into issue_3359_3 | Felipe Artur | 2016-06-29 | 1 | -6/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Insert notification settings dropdown into groups | Felipe Artur | 2016-06-22 | 1 | -14/+55 |
| * | | | | | | merge master into issue_3359_3 | Felipe Artur | 2016-06-22 | 158 | -933/+11458 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Insert notification settings dropdown into groups | Felipe Artur | 2016-06-22 | 1 | -14/+55 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'optimize-png-image' into 'master' | Jacob Schatz | 2016-06-29 | 1 | -0/+0 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | optimize png images losslessly using zopflipng | Peter Dave Hello | 2016-06-29 | 1 | -0/+0 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Added Bugzilla as external issue tracker option | Tim | 2016-06-29 | 1 | -0/+49 |
|/ / / / / | |||||
* | | | | | Merge branch 'zj-workhorse-format-patch' into 'master' | Robert Speicher | 2016-06-29 | 1 | -15/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Workhorse to serve email diffs | Z.J. van de Weg | 2016-06-28 | 1 | -15/+3 |
* | | | | | Add specssystem-info | Josh Frye | 2016-06-28 | 1 | -0/+17 |
* | | | | | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' | Rémy Coutable | 2016-06-28 | 1 | -12/+49 |
|\ \ \ \ \ | |||||
| * | | | | | Improve commit builds API endpoint RESTful behavior | Grzegorz Bizon | 2016-06-28 | 1 | -15/+48 |
| * | | | | | Find all builds for commit if multiple pipelines | Grzegorz Bizon | 2016-06-28 | 1 | -2/+6 |
* | | | | | | Use clock_gettime for all performance timestampsperformance-clock-adjustments | Yorick Peterse | 2016-06-28 | 1 | -2/+14 |
|/ / / / / | |||||
* | | | | | Merge branch 'feature/custom-highlighting' into 'master' | Rémy Coutable | 2016-06-28 | 2 | -0/+28 |
|\ \ \ \ \ | |||||
| * | | | | | support cgi style options, such as erb?parent=json | http://jneen.net/ | 2016-06-27 | 2 | -4/+15 |
| * | | | | | appease rubocop | http://jneen.net/ | 2016-06-27 | 1 | -2/+2 |
| * | | | | | check the tag so that an instance will pass too | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | fix the spec, using project.change_head | http://jneen.net/ | 2016-06-27 | 2 | -3/+10 |
| * | | | | | Revert "bump the master sha for gitlab-test!9" | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | bump the master sha for gitlab-test!9 | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | add custom highlighting via .gitattributes | http://jneen.net/ | 2016-06-27 | 1 | -0/+10 |
* | | | | | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-06-27 | 4 | -1/+135 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch 'fix-18997' into 'master' | Robert Speicher | 2016-06-27 | 2 | -1/+100 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix visibility of private project snippets for members when searching | Douglas Barbosa Alexandre | 2016-06-22 | 2 | -16/+58 |
| | * | | | | | Fix internal snippets can be searched by anyone | Douglas Barbosa Alexandre | 2016-06-22 | 2 | -1/+58 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch '19102-fix' into 'master' | Robert Speicher | 2016-06-27 | 2 | -0/+35 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix an information disclosure when requesting access to a group containing pr... | Rémy Coutable | 2016-06-24 | 2 | -0/+35 |
* | | | | | | | Rename Licenses API to License Templates API | Drew Blessing | 2016-06-27 | 1 | -1/+1 |
* | | | | | | | Merge branch 'issue_18398' into 'master' | Douwe Maan | 2016-06-27 | 1 | -0/+21 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Check for conflict with wiki projects when creating a new project.issue_18398 | Ruben Davila | 2016-06-27 | 1 | -0/+21 |
* | | | | | | | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 67 | -1015/+1015 |
| |_|_|_|/ / |/| | | | | |