summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Increase Unicorn memory limits to 300-350adjust-unicorn-memory-limitsYorick Peterse2016-01-201-2/+2
* Use env variables for Unicorn memory limitsYorick Peterse2016-01-202-1/+6
* Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-201-1/+1
|\
| * Fixed typoJohn Galt2016-01-191-1/+1
* | Update CHANGELOGRobert Speicher2016-01-191-5/+5
* | Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-196-9/+84
|\ \
| * | Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-196-9/+84
* | | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-199-27/+95
|\ \ \
| * \ \ Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-1911-33/+94
| |\ \ \
| * | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-199-27/+95
* | | | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-196-0/+37
|\ \ \ \ \
| * | | | | Add specs. Adjust filter.Josh Frye2016-01-192-1/+24
| * | | | | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-195-8/+12
| * | | | | Update all docs for public paramJosh Frye2016-01-192-0/+4
| * | | | | Add public params to GET /projects api. Closes #3788Josh Frye2016-01-193-0/+6
| |/ / / /
* | | | | Merge branch 'star-button-fork-count-increase' into 'master' Dmitriy Zaporozhets2016-01-191-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | when starring a project it correctly increase the star countPhil Hughes2016-01-191-2/+2
| | |/ / | |/| |
* | | | Merge branch 'display-message-when-assignee-cannot-merge' into 'master' Dmitriy Zaporozhets2016-01-193-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Move multiple css rules to multiple lines.display-message-when-assignee-cannot-mergeJacob Schatz2016-01-192-2/+2
| * | | Fix spacing issues, fix naming inconsistencies. Fix conflicts.Jacob Schatz2016-01-182-4/+4
| * | | color variable for error for exclamation pointJacob Schatz2016-01-182-2/+4
| * | | adds exclamation point when assigned user cannot mergeJacob Schatz2016-01-182-0/+8
* | | | Merge branch 'fix-project-creation' into 'master' Douwe Maan2016-01-193-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-193-1/+3
* | | | Merge branch 'improve-project-external-issue-trackers' into 'master' Douwe Maan2016-01-198-33/+92
|\ \ \ \ | |_|_|/ |/| | |
| * | | Greatly improve external_issue_tracker performanceimprove-project-external-issue-trackersYorick Peterse2016-01-198-33/+92
* | | | Merge branch 'fix/artifacts-double-propagation' into 'master' Grzegorz Bizon2016-01-191-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix double request issue in artifacts browserGrzegorz Bizon2016-01-191-1/+5
| |/ /
* | | Merge branch 'feature/expose-ci-lint-tool'Douwe Maan2016-01-196-12/+33
|\ \ \
| * | | Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-toolGrzegorz Bizon2016-01-183-12/+6
| * | | Update build artifacts feature testsGrzegorz Bizon2016-01-171-6/+6
| * | | Add Changelog entry for exposing CI Lint tool on builds pageGrzegorz Bizon2016-01-171-0/+1
| * | | Add specs for CI Lint button exposed on a builds pageGrzegorz Bizon2016-01-173-5/+20
| * | | Reuse existing CSS classes when exposing CI Lint toolGrzegorz Bizon2016-01-171-10/+9
| * | | Expose link to CI Lint Tool on builds pageGrzegorz Bizon2016-01-171-1/+13
* | | | Merge branch 'fix-consider-re-assign-as-a-mention'Douwe Maan2016-01-193-9/+71
|\ \ \ \ | |_|/ / |/| | |
| * | | This will ensure previous assignee gets an email even if his notif level is "...fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-152-5/+44
| * | | Add changelog entry for fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-0/+1
| * | | Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-152-6/+28
* | | | Merge branch 'warning-pending-migrations' into 'master' Robert Speicher2016-01-193-3/+5
|\ \ \ \
| * | | | Raise an error on page load if there are pending migrations on dev envDouglas Barbosa Alexandre2016-01-191-0/+3
| * | | | Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-192-3/+2
* | | | | Merge branch 'browse-issues-incorrect-positioning-in-firefox-on-commit-page' ...Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \
| * | | | | Fix positioning issues with browse files buttonbrowse-issues-incorrect-positioning-in-firefox-on-commit-pageJacob Schatz2016-01-181-0/+4
| |/ / / /
* | | | | Merge branch 'search-title-clipped' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \
| * | | | | Search title was getting clipped horizontally.search-title-clippedJacob Schatz2016-01-161-0/+4
* | | | | | Merge branch 'sorting-dropdown-does-not-fit-filter-bar' into 'master' Dmitriy Zaporozhets2016-01-191-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Reduce margin to fit dropdownsJacob Schatz2016-01-181-1/+1
|/ / / / /
* | | | | Merge branch 'fix_changelog' into 'master' Robert Speicher2016-01-181-1/+1
|\ \ \ \ \
| * | | | | Move entry `Fix: As an admin, cannot add oneself as a member to a group/project`fix_changelogDrew Blessing2016-01-181-1/+1
View Lorry Controller Status