summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-15134-4265/+2169
|\
| * Merge branch '12743-subscribe-to-label' into 'master' Rémy Coutable2016-03-1541-137/+660
| |\
| | * 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-1536-310/+439
| | * Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-1531-64/+458
| * | Add 8.5.6 CHANGELOG itemsRémy Coutable2016-03-151-0/+3
| * | Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-158-0/+393
| |\ \
| | * | Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add documenta...connorshea2016-03-148-0/+393
| * | | Merge branch 'if-statement-syntax-fix' into 'master' Robert Speicher2016-03-151-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Remove parentheses from if statementconnorshea2016-03-151-1/+1
| |/ /
| * | Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher2016-03-152-0/+13
| |\ \
| | * | Ignore eager loading in Project.search UNIONYorick Peterse2016-03-152-0/+13
| * | | 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 'patch-1' into 'master' Jeroen van Baarsen2016-03-151-1/+1
| |\ \ \ \ \
| | * | | | | Fix typo in Ruby CI test and deploy exampleJasper Denkers2016-03-141-1/+1
| * | | | | | Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-1521-3538/+17
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-1521-3538/+17
| | | |_|_|/ / | | |/| | | |
| * | | | | | 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-156-2/+43
| |\ \ \ \ \ \
| | * | | | | | Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-086-2/+43
| * | | | | | | Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master' Douwe Maan2016-03-154-3/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobsRémy Coutable2016-03-154-3/+12
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'bundler-audit-only-master' into 'master' Robert Speicher2016-03-151-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | bundle:audit job only on masterZeger-Jan van de Weg2016-03-151-1/+3
| * | | | | | | | Merge branch 'application-settings' into 'master' Robert Speicher2016-03-1512-134/+143
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-136-124/+97
| | * | | | | | | 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-043-10/+5
| | * | | | | | | Applications tab on profile settingsPhil Hughes2016-03-046-86/+119
| * | | | | | | | Merge branch 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-157-5/+139
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use an exception to pass messagesJacob Vosmaer2016-03-155-23/+42
| | * | | | | | | | Use strings instead of symbolsauto-gcJacob Vosmaer2016-03-141-3/+3
| | * | | | | | | | Run 'git gc' every 10 pushesJacob Vosmaer2016-03-146-4/+65
| | * | | | | | | | Allow project housekeeping only once an hourJacob Vosmaer2016-03-143-2/+56
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'ci_note_win_runner' into 'master' Achilleas Pipinellis2016-03-151-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Windows CI support is full since Runner v1.0.0Achilleas Pipinellis2016-03-151-1/+1
| |/ / / / / / /
| * | | | | | | 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