summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Only show Edit button for text blobs.edit-in-patch-branchDouwe Maan2015-12-081-2/+2
* Show tooltip when trying to edit file when not on branchDouwe Maan2015-12-086-32/+41
* Default target branch to patch-n when editing file in protected branchDouwe Maan2015-12-085-7/+33
* Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-089-16/+73
|\
| * Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-073-6/+6
| * Add specs for showing lfs object in UI.Marin Jankovski2015-12-079-20/+46
| * Recursivity needed if a fork is a fork of a fork.Marin Jankovski2015-12-041-1/+1
| * Don't show diffs for lfs pointers.Marin Jankovski2015-12-042-4/+2
| * Move the file serving to Raw controller, add a few ifs to view.Marin Jankovski2015-12-035-30/+36
| * If a user clicks on the LFS object, it should be served if the user has acces...Marin Jankovski2015-12-032-0/+27
* | Merge branch 'rs-validators' into 'master' Douwe Maan2015-12-0820-58/+188
|\ \
| * | Inline Gitlab::Blacklist in NamespaceValidatorrs-validatorsRobert Speicher2015-12-071-4/+32
| * | Add custom NamespaceNameValidatorRobert Speicher2015-12-072-3/+13
| * | Add custom NamespaceValidatorRobert Speicher2015-12-073-9/+27
| * | Add custom LineCodeValidatorRobert Speicher2015-12-073-2/+14
| * | Minor EmailValidator refactorRobert Speicher2015-12-071-7/+4
| * | Add custom ColorValidatorRobert Speicher2015-12-073-7/+25
| * | Move EmailValidator to app/validatorsRobert Speicher2015-12-071-0/+21
| * | Add custom UrlValidatorRobert Speicher2015-12-079-37/+63
* | | Merge branch 'master' into fix-merge-request-that-removes-submodulefix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-076-28/+26
|\ \ \
| * | | Fix random failing test - delete attachmentfix-random-testDmitriy Zaporozhets2015-12-071-2/+2
| |/ /
| * | Merge branch 'pberndt:master' into 'master' Robert Speicher2015-12-071-1/+1
| |\ \
| | * | time_ago_with_tooltip javascript snippet: Don't reinitialize older elementsPhillip Berndt2015-12-031-1/+1
| * | | Merge branch 'fix-parallel-merge' into 'master' Dmitriy Zaporozhets2015-12-071-2/+2
| |\ \ \
| | * | | Dont use cached collection for Repository find_branch and find_tag methodsDmitriy Zaporozhets2015-12-071-2/+2
| * | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-072-20/+21
| |\ \ \ \
| | * | | | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-042-20/+21
| * | | | | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-071-3/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-041-3/+0
* | | | | | Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-0739-135/+396
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-072-3/+27
| |\ \ \ \ \
| | * | | | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-071-16/+9
| | * | | | | fox specsValery Sizov2015-12-072-15/+24
| | * | | | | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-041-1/+23
| * | | | | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-077-10/+47
| |\ \ \ \ \ \
| | * | | | | | Satisfy RubocopDouwe Maan2015-12-071-1/+1
| | * | | | | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-07143-827/+1062
| | |\ \ \ \ \ \
| | * | | | | | | sort milestones by due_dateGreg Smethells2015-12-037-11/+48
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-077-30/+82
| |\ \ \ \ \ \ \
| | * | | | | | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notesGrzegorz Bizon2015-12-071-2/+1
| | * | | | | | | Remove space before exclamation mark in award alertGrzegorz Bizon2015-12-051-1/+1
| | * | | | | | | Refactor note awards to reuse `emoji_pattern` and improve validatorGrzegorz Bizon2015-12-051-18/+14
| | * | | | | | | Make method `supports_award?` public in `Note`Grzegorz Bizon2015-12-031-2/+2
| | * | | | | | | Combine new javascript Flash methods into oneGrzegorz Bizon2015-12-032-7/+3
| | * | | | | | | Support emoji awards also in merge requestsGrzegorz Bizon2015-12-031-3/+4
| | * | | | | | | Pin flash message to top if award note is invalidGrzegorz Bizon2015-12-031-1/+3
| | * | | | | | | Add new features to javascript flash messageGrzegorz Bizon2015-12-032-6/+23
| | * | | | | | | Show flash message instead of alert when note is invalidGrzegorz Bizon2015-12-031-1/+2
| | * | | | | | | Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-032-1/+10
| | * | | | | | | Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
View Lorry Controller Status