summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix term height so text overflap does not happen.ui-is-broken-in-search-result-pageJacob Schatz2016-01-201-4/+0
* Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-206-7/+6
|\
| * Simplifies the HAML if statement for project branch URLJacob Schatz2016-01-201-6/+2
| * Fix HTML so code passessecret-shortcut-featureJacob Schatz2016-01-201-2/+2
| * Fixes test to not search whole page for content.Jacob Schatz2016-01-201-1/+1
| * Fix project find url so branch ref is not nilJacob Schatz2016-01-192-3/+7
| * Proper spacing in HAML file `if` statement.Jacob Schatz2016-01-191-1/+1
| * Removes `defined?` in favor to just `if`Jacob Schatz2016-01-191-1/+1
| * Add reference to the correct branch.Jacob Schatz2016-01-191-1/+1
| * Adds `t` as a shortcut for find file anywhereJacob Schatz2016-01-194-5/+4
* | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-201-1/+1
|\ \
| * | Fixed invalid JSON in first JSON Example line 27Ruben Schmidt2016-01-181-1/+1
* | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-207-5/+56
|\ \ \
| * | | Fix broken specs.issue_3749Rubén Dávila2016-01-191-4/+8
| * | | Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-192-5/+2
| * | | Check if object respond to #touch before update.Rubén Dávila2016-01-181-1/+2
| * | | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-186-1/+50
* | | | Merge branch 'ci/artifacts-remove-compressed-size' into 'master' Douwe Maan2016-01-203-4/+0
|\ \ \ \
| * | | | Remove `Compressed to` column from build artifacts browserci/artifacts-remove-compressed-sizeGrzegorz Bizon2016-01-203-4/+0
* | | | | 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