summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into issue_14678Alfredo Sumaran2016-04-07139-945/+1826
|\
| * Merge branch 'indentation-bug' into 'master' Jacob Schatz2016-04-071-3/+3
| |\
| | * Indentation updateindentation-bugAnnabel Dunstone2016-04-071-2/+0
| | * Preserve white spaceAnnabel Dunstone2016-04-071-1/+3
| * | Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' Jacob Schatz2016-04-071-1/+1
| |\ \
| | * | Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre2016-04-071-1/+1
| | |/
| * | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-073-6/+35
| |\ \ | | |/ | |/|
| | * Implement review suggestionsFelipe Artur2016-04-072-6/+4
| | * Improve codeFelipe Artur2016-04-052-16/+21
| | * Improve codeFelipe Artur2016-04-051-7/+15
| | * Fix problem when creating milestones in groups without projectsFelipe Artur2016-04-051-5/+23
| * | Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable2016-04-071-6/+8
| |\ \
| | * | Remove duplication. Remove JS data attributesJacob Schatz2016-04-071-6/+6
| | * | Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allowJacob Schatz2016-04-071-5/+7
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-071-6/+9
| |\ \ \
| | * \ \ Merge branch 'fix/2fa-authentication-spoofing' into 'master' Rémy Coutable2016-04-071-6/+9
| | |\ \ \
| | | * | | Fix 2FA authentication spoofing vulnerabilityGrzegorz Bizon2016-04-071-6/+9
| * | | | | Merge branch 'fix-project-404-cache-issue' into 'master' Yorick Peterse2016-04-071-0/+2
| |\ \ \ \ \
| | * | | | | Expire caches after project creation to ensure a consistent stateStan Hu2016-04-071-0/+2
| * | | | | | Merge branch 'update_main_lang_if_unset' into 'master' Rémy Coutable2016-04-071-5/+5
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Only update main language if it is not already setupdate_main_lang_if_unsetDrew Blessing2016-04-061-5/+5
| * | | | | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-074-2/+40
| |\ \ \ \ \ \
| | * | | | | | Use default branch when displaying list of badgesGrzegorz Bizon2016-04-061-1/+1
| | * | | | | | Change name of badge variable in badges controllerGrzegorz Bizon2016-04-062-4/+4
| | * | | | | | Remove obsolete badge code from project viewGrzegorz Bizon2016-04-061-3/+0
| | * | | | | | Expose project badges in project settings menuGrzegorz Bizon2016-04-062-1/+8
| | * | | | | | Make it possible to switch ref in badges viewGrzegorz Bizon2016-04-062-0/+4
| | * | | | | | Add project header title in project badges viewGrzegorz Bizon2016-04-061-0/+2
| | * | | | | | Use highlight helper to render badges code syntaxGrzegorz Bizon2016-04-061-4/+4
| | * | | | | | Improve view with list of badgesGrzegorz Bizon2016-04-061-7/+12
| | * | | | | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-062-3/+5
| | * | | | | | Add project badges view prototypeGrzegorz Bizon2016-04-063-1/+22
| * | | | | | | Merge branch 'fix_14638' into 'master' Rémy Coutable2016-04-071-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes #14638.PotHix2016-04-061-1/+1
| * | | | | | | | Return status code 303 after a branch DELETE operation to avoid project deletionStan Hu2016-04-062-2/+4
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Reset MR optsanti-memoizer-mr-fixJacob Schatz2016-04-062-1/+9
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-071-1/+1
| |\ \ \ \ \ \
| | * | | | | | Avoid saving again if the user attributes haven't changedPatricio Cano2016-04-041-1/+1
| * | | | | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-072-1/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-302-1/+19
| * | | | | | | | Merge branch 'issue_14952' into 'master' Jacob Schatz2016-04-061-2/+2
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into issue_14952Alfredo Sumaran2016-04-0611-50/+128
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use .new_record? insteadAlfredo Sumaran2016-04-061-2/+2
| | * | | | | | | | | Do not add location badge when creating a group or projectissue_14952Alfredo Sumaran2016-04-051-2/+2
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '14866-url-overflow' into 'master' Jacob Schatz2016-04-065-3/+14
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Change word-break to word-wrapAnnabel Dunstone2016-04-061-1/+1
| | * | | | | | | | Horizontally scroll code blocks instead of wrapping14866-url-overflowAnnabel Dunstone2016-04-066-5/+15
| | * | | | | | | | Wrap code blocks to next lineAnnabel Dunstone2016-04-061-1/+2
| * | | | | | | | | Merge branch 'issue_14800' into 'master' Jacob Schatz2016-04-065-35/+64
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Do not fire blur event when clicking a suggestionAlfredo Sumaran2016-04-061-2/+4
View Lorry Controller Status