summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-123-4/+23
* Merge branch 'rs-prepare-rc1' into 'master' Robert Speicher2016-01-122-2/+150
|\
| * Prepare Installation and Update docs for 8.4 RC1Robert Speicher2016-01-122-2/+150
|/
* Merge branch 'rs-revert-remove-filters' into 'master' Robert Speicher2016-01-121-6/+0
|\
| * Revert "Remove the `:coffee` and `:coffeescript` Haml filters"Robert Speicher2016-01-121-6/+0
|/
* Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\
| * Revert group milestone copychange_milestone_close_copyJosh Frye2016-01-121-1/+1
| * Change milestone close notice copy. Closes #6051Josh Frye2016-01-112-2/+2
* | Merge branch 'improve_more_buttons' into 'master' Jacob Schatz2016-01-123-4/+4
|\ \
| * | Improve admin area button styleDrew Blessing2016-01-113-4/+4
* | | Merge branch 'changelog-8.3.4' into 'master' Robert Speicher2016-01-121-0/+3
|\ \ \
| * | | Add CHANGELOG entry for 8.3.4Jacob Vosmaer2016-01-121-0/+3
* | | | Merge branch 'gitlab-omnibus-really' into 'master' Robert Speicher2016-01-122-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Never heard of gitlab-omnibusgitlab-omnibus-reallyJacob Vosmaer2016-01-122-3/+3
* | | | Merge branch 'gitlab-workhorse-0.5.4' into 'master' Jacob Vosmaer2016-01-123-3/+3
|\ \ \ \
| * | | | Use gitlab-workhorse 0.5.4gitlab-workhorse-0.5.4Jacob Vosmaer2016-01-123-3/+3
| |/ / /
* | | | Merge branch 'remove-application-frames-from-views' into 'master' Yorick Peterse2016-01-124-40/+2
|\ \ \ \
| * | | | Stop tracking call stacks for instrumented viewsremove-application-frames-from-viewsYorick Peterse2016-01-124-40/+2
* | | | | Merge branch 'add_make' into 'master' Achilleas Pipinellis2016-01-121-0/+1
|\ \ \ \ \
| * | | | | added make command to docsChristian Mehlmauer2016-01-041-0/+1
* | | | | | Merge branch 'allocated-memory-per-transaction' into 'master' Yorick Peterse2016-01-122-7/+37
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Track memory allocated during a transactionYorick Peterse2016-01-122-7/+37
| | |/ / / | |/| | |
* | | | | Merge branch 'show-ip-addresses' into 'master' Dmitriy Zaporozhets2016-01-122-0/+17
|\ \ \ \ \
| * | | | | Add user's last used IP addresses to admin pageStan Hu2016-01-122-0/+17
* | | | | | Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-123-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve button stylesDrew Blessing2016-01-083-4/+4
* | | | | | Merge branch 'changelog-metrics' into 'master' Yorick Peterse2016-01-121-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updated CHANGELOG with changes I madeYorick Peterse2016-01-121-0/+3
|/ / / / /
* | | | | Merge branch 'update-fog' into 'master' Dmitriy Zaporozhets2016-01-123-18/+65
|\ \ \ \ \
| * | | | | Bump fog to 1.36.0Stan Hu2016-01-113-18/+65
* | | | | | Merge branch 'hover-descriptions' into 'master' Dmitriy Zaporozhets2016-01-121-5/+9
|\ \ \ \ \ \
| * | | | | | adds hover titles to merge request and issue pageshover-descriptionsJacob Schatz2016-01-111-5/+9
| |/ / / / /
* | | | | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ \ \ \ \
| * | | | | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
* | | | | | | Merge branch 'rs-add-title-to-emoji' into 'master' Dmitriy Zaporozhets2016-01-121-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
* | | | | | | | Merge branch 'rs-remove-coffee-filters' into 'master' Dmitriy Zaporozhets2016-01-121-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the `:coffee` and `:coffeescript` Haml filtersrs-remove-coffee-filtersRobert Speicher2016-01-111-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'typo-fix' into 'master' Robert Schilling2016-01-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Fixed minor typo in docker documentationJohn Galt2016-01-111-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rs-clear-current-timer' into 'master' Robert Speicher2016-01-111-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ / / / / / /
* | | | | | | Update CHANGELOGRobert Speicher2016-01-111-6/+6
* | | | | | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-114-5/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-114-5/+16
* | | | | | | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-112-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Generate builds when creating tag using web interfacefix-ci-builds-for-tagsKamil Trzcinski2016-01-112-0/+2
* | | | | | | | Merge branch 'gitlab-workhorse-0.5.3' into 'master' Robert Speicher2016-01-113-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use gitlab-workhorse 0.5.3gitlab-workhorse-0.5.3Jacob Vosmaer2016-01-113-3/+3
* | | | | | | | | Merge branch 'optimize_ldap' into 'master' Douwe Maan2016-01-117-11/+37
|\ \ \ \ \ \ \ \ \