summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'support-utf8-wiki-page-title' into 'master' Douwe Maan2016-03-162-5/+5
|\
| * Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-162-5/+5
* | Merge branch 'worker-for-user-deletion' into 'master' Douwe Maan2016-03-166-17/+31
|\ \
| * | Clearify who deletes the userZeger-Jan van de Weg2016-03-153-4/+4
| * | Fix broken specsZeger-Jan van de Weg2016-03-151-1/+1
| * | Specs on force deleting of a userZeger-Jan van de Weg2016-03-151-1/+1
| * | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-155-17/+21
| * | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-152-1/+11
* | | Merge branch 'issue_14301' into 'master' Robert Speicher2016-03-151-1/+1
|\ \ \
| * | | TypoAlfredo Sumaran2016-03-151-1/+1
| |/ /
* | | Merge branch 'dropdown-vertical-spacing' into 'master' Jacob Schatz2016-03-151-3/+2
|\ \ \ | |/ / |/| |
| * | Fixed overflow on users name in dropdownsdropdown-vertical-spacingPhil Hughes2016-03-151-3/+2
* | | Merge branch '12743-subscribe-to-label' into 'master' Rémy Coutable2016-03-1527-121/+267
|\ \ \ | |_|/ |/| |
| * | Create a SentNotification record for #relabeled_issue_email / #relabeled_merg...Rémy Coutable2016-03-153-10/+23
| * | Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-153-28/+15
| * | Improving the original label-subscribing implementationRémy Coutable2016-03-1525-160/+169
| * | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-1520-49/+186
* | | Remove parentheses from if statementconnorshea2016-03-151-1/+1
|/ /
* | Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher2016-03-151-0/+7
|\ \
| * | Ignore eager loading in Project.search UNIONYorick Peterse2016-03-151-0/+7
| |/
* | Merge branch 'todos-title-attr' into 'master' Robert Speicher2016-03-156-8/+8
|\ \
| * | Remove last to_referencetodos-title-attrJosh Frye2016-03-131-1/+1
| * | Escape!Josh Frye2016-03-115-8/+8
| * | Title attributes for activity feedJosh Frye2016-03-117-10/+10
| * | RubocopJosh Frye2016-03-101-1/+1
| * | Set link title for todos. Closes #14042Josh Frye2016-03-101-1/+1
* | | Merge branch 'external-issue-tracker' into 'master' Yorick Peterse2016-03-151-0/+1
|\ \ \
| * | | Return the external issue tracker even if it's nullexternal-issue-trackerKamil Trzcinski2016-03-151-0/+1
* | | | Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-159-128/+5
|\ \ \ \
| * | | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-159-128/+5
| | |_|/ | |/| |
* | | | Merge branch 'ci-fix-double-borders' into 'master' Robert Speicher2016-03-153-7/+9
|\ \ \ \
| * | | | Use klass instead of clazzci-fix-double-bordersKamil Trzcinski2016-03-151-3/+3
| * | | | Fix double borders around the CI statusKamil Trzcinski2016-03-153-7/+9
| |/ / /
* | | | Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan2016-03-151-1/+5
|\ \ \ \
| * | | | Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-081-1/+5
* | | | | Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master' Douwe Maan2016-03-152-2/+6
|\ \ \ \ \
| * | | | | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobsRémy Coutable2016-03-152-2/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'application-settings' into 'master' Robert Speicher2016-03-159-124/+138
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-135-123/+96
| * | | | Removed page specific variablesPhil Hughes2016-03-043-9/+12
| * | | | Moved scss values into variablesPhil Hughes2016-03-043-7/+12
| * | | | Fixed Ruby style errorPhil Hughes2016-03-041-1/+1
| * | | | Fixed failing application settings testsPhil Hughes2016-03-041-1/+1
| * | | | Applications tab on profile settingsPhil Hughes2016-03-046-86/+119
* | | | | Merge branch 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-153-4/+45
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use an exception to pass messagesJacob Vosmaer2016-03-153-14/+21
| * | | | Run 'git gc' every 10 pushesJacob Vosmaer2016-03-142-2/+22
| * | | | Allow project housekeeping only once an hourJacob Vosmaer2016-03-142-2/+16
* | | | | Merge branch 'filter-bug-fix' into 'master' Dmitriy Zaporozhets2016-03-151-4/+8
|\ \ \ \ \
| * | | | | Fix bug with JS error from dropdowns in filter areafilter-bug-fixJacob Schatz2016-03-141-4/+8
View Lorry Controller Status