Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 4009-external-users4009-external-users | Zeger-Jan van de Weg | 2016-03-15 | 80 | -693/+759 |
|\ | |||||
| * | Merge branch '12743-subscribe-to-label' into 'master' | Rémy Coutable | 2016-03-15 | 27 | -121/+267 |
| |\ | |||||
| | * | Create a SentNotification record for #relabeled_issue_email / #relabeled_merg... | Rémy Coutable | 2016-03-15 | 3 | -10/+23 |
| | * | Move the #toggle_subscription controller method to a concern | Rémy Coutable | 2016-03-15 | 3 | -28/+15 |
| | * | Improving the original label-subscribing implementation | Rémy Coutable | 2016-03-15 | 25 | -160/+169 |
| | * | Original implementation to allow users to subscribe to labels | Timothy Andrew | 2016-03-15 | 20 | -49/+186 |
| * | | Remove parentheses from if statement | connorshea | 2016-03-15 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'fix-activerecord-join-stupidity' into 'master' | Robert Speicher | 2016-03-15 | 1 | -0/+7 |
| |\ | |||||
| | * | Ignore eager loading in Project.search UNION | Yorick Peterse | 2016-03-15 | 1 | -0/+7 |
| * | | Merge branch 'todos-title-attr' into 'master' | Robert Speicher | 2016-03-15 | 6 | -8/+8 |
| |\ \ | |||||
| | * | | Remove last to_referencetodos-title-attr | Josh Frye | 2016-03-13 | 1 | -1/+1 |
| | * | | Escape! | Josh Frye | 2016-03-11 | 5 | -8/+8 |
| | * | | Title attributes for activity feed | Josh Frye | 2016-03-11 | 7 | -10/+10 |
| | * | | Rubocop | Josh Frye | 2016-03-10 | 1 | -1/+1 |
| | * | | Set link title for todos. Closes #14042 | Josh Frye | 2016-03-10 | 1 | -1/+1 |
| * | | | Merge branch 'external-issue-tracker' into 'master' | Yorick Peterse | 2016-03-15 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Return the external issue tracker even if it's nullexternal-issue-tracker | Kamil Trzcinski | 2016-03-15 | 1 | -0/+1 |
| * | | | | Merge branch 'revert-avatar-cropping' into 'master' | Rémy Coutable | 2016-03-15 | 9 | -128/+5 |
| |\ \ \ \ | |||||
| | * | | | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-cropping | Rémy Coutable | 2016-03-15 | 9 | -128/+5 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'ci-fix-double-borders' into 'master' | Robert Speicher | 2016-03-15 | 3 | -7/+9 |
| |\ \ \ \ | |||||
| | * | | | | Use klass instead of clazzci-fix-double-borders | Kamil Trzcinski | 2016-03-15 | 1 | -3/+3 |
| | * | | | | Fix double borders around the CI status | Kamil Trzcinski | 2016-03-15 | 3 | -7/+9 |
| | |/ / / | |||||
| * | | | | Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' | Douwe Maan | 2016-03-15 | 1 | -1/+5 |
| |\ \ \ \ | |||||
| | * | | | | Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iid | Rémy Coutable | 2016-03-08 | 1 | -1/+5 |
| * | | | | | Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master' | Douwe Maan | 2016-03-15 | 2 | -2/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobs | Rémy Coutable | 2016-03-15 | 2 | -2/+6 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'application-settings' into 'master' | Robert Speicher | 2016-03-15 | 9 | -124/+138 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settings | Robert Speicher | 2016-03-13 | 5 | -123/+96 |
| | * | | | | Removed page specific variables | Phil Hughes | 2016-03-04 | 3 | -9/+12 |
| | * | | | | Moved scss values into variables | Phil Hughes | 2016-03-04 | 3 | -7/+12 |
| | * | | | | Fixed Ruby style error | Phil Hughes | 2016-03-04 | 1 | -1/+1 |
| | * | | | | Fixed failing application settings tests | Phil Hughes | 2016-03-04 | 1 | -1/+1 |
| | * | | | | Applications tab on profile settings | Phil Hughes | 2016-03-04 | 6 | -86/+119 |
| * | | | | | Merge branch 'auto-gc' into 'master' revert-01160fc0 | Douwe Maan | 2016-03-15 | 3 | -4/+45 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Use an exception to pass messages | Jacob Vosmaer | 2016-03-15 | 3 | -14/+21 |
| | * | | | | Run 'git gc' every 10 pushes | Jacob Vosmaer | 2016-03-14 | 2 | -2/+22 |
| | * | | | | Allow project housekeeping only once an hour | Jacob Vosmaer | 2016-03-14 | 2 | -2/+16 |
| * | | | | | Merge branch 'filter-bug-fix' into 'master' | Dmitriy Zaporozhets | 2016-03-15 | 1 | -4/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix bug with JS error from dropdowns in filter areafilter-bug-fix | Jacob Schatz | 2016-03-14 | 1 | -4/+8 |
| * | | | | | | Merge branch 'group-projects-page' into 'master' | Dmitriy Zaporozhets | 2016-03-15 | 4 | -42/+27 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Redesign project tabs on group pagegroup-projects-page | Dmitriy Zaporozhets | 2016-03-14 | 4 | -42/+27 |
| * | | | | | | Merge branch 'fix-commit-status-rendering' into 'master' | Robert Speicher | 2016-03-15 | 13 | -214/+172 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix review commentsfix-commit-status-rendering | Kamil Trzcinski | 2016-03-14 | 5 | -7/+9 |
| | * | | | | | | Cleanup CiCommit and CiBuild | Kamil Trzcinski | 2016-03-14 | 13 | -214/+170 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Fixes issue with unassigned not working in dropdownzero-dropdown-id | Phil Hughes | 2016-03-14 | 2 | -2/+2 |
| * | | | | | | Merge branch 'nav-over-content-mobile' into 'master' | Jacob Schatz | 2016-03-14 | 5 | -43/+66 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Removed call to setup from breakpoint size methodnav-over-content-mobile | Phil Hughes | 2016-03-14 | 1 | -5/+5 |
| | * | | | | | | Changed breakpoint size | Phil Hughes | 2016-03-14 | 5 | -28/+34 |
| | * | | | | | | removed un-used function call | Phil Hughes | 2016-03-14 | 1 | -3/+3 |
| | * | | | | | | Created bootstrap breakpoint class | Phil Hughes | 2016-03-14 | 5 | -37/+41 |