Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restore "r" shortcutfix-r-shortcut | Alfredo Sumaran | 2016-05-04 | 1 | -0/+4 |
* | Merge branch 'gravatar-fix' into 'master' | Rémy Coutable | 2016-05-04 | 3 | -3/+3 |
|\ | |||||
| * | Use the new admin settings for gravatar | Artem Sidorenko | 2016-05-04 | 3 | -3/+3 |
* | | Merge branch 'compact-files-list' into 'master' | Jacob Schatz | 2016-05-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | Make files list more compact by reducing row height from 47px to 44pxcompact-files-list | Dmitriy Zaporozhets | 2016-05-02 | 1 | -1/+1 |
* | | | Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master' | Rémy Coutable | 2016-05-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix: in recent versions of Docker, the /.dockerinit file doesn't exist; use /... | Jason Roehm | 2016-04-26 | 1 | -1/+1 |
* | | | | Merge branch 'exec-in-launch-wrappers' into 'master' | Douwe Maan | 2016-05-04 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Use 'exec' in Unicorn and Sidekiq launch scripts | Jacob Vosmaer | 2016-04-28 | 2 | -3/+3 |
* | | | | | Merge branch 'use-rugged-to-create-tag' into 'master' | Rémy Coutable | 2016-05-04 | 9 | -67/+105 |
|\ \ \ \ \ | |||||
| * | | | | | Use a similar approach to branch creation for tag creationuse-rugged-to-create-tag | Rémy Coutable | 2016-05-04 | 5 | -53/+102 |
| * | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_ta... | Rémy Coutable | 2016-05-04 | 7 | -49/+38 |
* | | | | | | Merge branch 'fix-typo-in-user-steps' into 'master' | Rémy Coutable | 2016-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo in user steps feature | Karlo Soriano | 2016-04-27 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'doc-fix-db-gem-install-instructions' into 'master' | Rémy Coutable | 2016-05-04 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add explicit --with statement for postgres and mysql gem groups as necessary.... | mike | 2016-04-27 | 1 | -2/+2 |
* | | | | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits' | Douwe Maan | 2016-05-04 | 11 | -9/+71 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | API support for the 'since' and 'until' operators on commit requests | Paco Guzman | 2016-04-29 | 11 | -9/+71 |
| |/ / / / | |||||
* | | | | | Merge branch 'feature-proposal-contribution-guidelines' into 'master' | Douwe Maan | 2016-05-04 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | feature proposal issue template in contributing guidefeature-proposal-contribution-guidelines | Job van der Voort | 2016-04-28 | 1 | -0/+10 |
* | | | | | | Merge branch 'lstrip-cop' into 'master' | Rémy Coutable | 2016-05-04 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable LstripRstrip cop | Connor Shea | 2016-04-27 | 1 | -2/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'add-instrumentation-for-15137' into 'master' | Yorick Peterse | 2016-05-04 | 2 | -15/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Instrument methods used in email diffs | Sean McGivern | 2016-05-04 | 2 | -15/+25 |
* | | | | | | | Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master' | Rémy Coutable | 2016-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unnecessary method call in events view | Karlo Soriano | 2016-05-01 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'create-wikis-during-check' into 'master' | Douwe Maan | 2016-05-04 | 2 | -16/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Initialize wikis on legacy projects during check | Jacob Vosmaer | 2016-04-26 | 2 | -16/+51 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'revert-devise-async' into 'master' | Rémy Coutable | 2016-05-04 | 5 | -2/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Remove the Devise Async gem." | Connor Shea | 2016-05-03 | 5 | -2/+6 |
* | | | | | | | | Merge branch 'rs-unique-signup-fields' into 'master' | Douwe Maan | 2016-05-04 | 4 | -22/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve uniqueness of field names on the signup formrs-unique-signup-fields | Robert Speicher | 2016-04-19 | 4 | -22/+29 |
* | | | | | | | | | Merge branch 'fix-performance-links' into 'master' | Yorick Peterse | 2016-05-04 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fixed username links in the performance guide | Yorick Peterse | 2016-05-04 | 1 | -3/+3 |
* | | | | | | | | | Merge branch 'fix-master-spec' into 'master' | Rémy Coutable | 2016-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix a spec that was failing due to !3483 | Rémy Coutable | 2016-05-04 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'patch-1' into 'master' | Achilleas Pipinellis | 2016-05-04 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Made it clearer that issue_id means iid, not id. | Aral Balkan | 2016-05-04 | 1 | -5/+5 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'signout-rel-url' into 'master' | Robert Speicher | 2016-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use sign out path only if not empty | Artem Sidorenko | 2016-05-03 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'upgrade-rspec-rails' into 'master' | Robert Speicher | 2016-05-03 | 3 | -25/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update rspec-rails from 3.3.3 to 3.4.2. | Connor Shea | 2016-05-01 | 3 | -25/+19 |
* | | | | | | | | | | Merge branch 'link-to-code-review-guide' into 'master' | Robert Speicher | 2016-05-03 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Link to gitlab code review guide in contributing guidelines | Karlo Soriano | 2016-05-03 | 1 | -2/+1 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'improve-2fa-note' into 'master' | Robert Speicher | 2016-05-03 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Improve the Two-factor Authentication sign-in text [ci skip] | connorshea | 2016-05-03 | 2 | -2/+3 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'doc-installation-pg_trgm' into 'master' | Achilleas Pipinellis | 2016-05-03 | 1 | -7/+49 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add clear instructions on installing the pg_trgm extension | Achilleas Pipinellis | 2016-05-03 | 1 | -7/+49 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'performance-guide' into 'master' | Achilleas Pipinellis | 2016-05-03 | 2 | -0/+259 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Copyedit performance document | Achilleas Pipinellis | 2016-05-03 | 1 | -22/+22 |