summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-061-0/+2
|\
| * Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| * Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| * Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-1/+2
| * Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-211-1/+2
* | Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-031-1/+2
|\ \
| * | Render 404 when polling commit notes without having permissionsissue_39176Felipe Artur2017-11-031-1/+2
* | | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-031-4/+3
|\ \ \
| * | | Find the LFS-objects for a fork within a the fork networkBob Van Landuyt2017-11-031-4/+3
* | | | Merge branch 'refactor-services-for-audit-events-ce' into 'master'Grzegorz Bizon2017-11-033-29/+17
|\ \ \ \
| * | | | fix typorefactor-services-for-audit-events-ceJames Lopez2017-11-021-1/+1
| * | | | fix specsJames Lopez2017-11-021-1/+1
| * | | | fix specsJames Lopez2017-11-021-1/+1
| * | | | refactor codeJames Lopez2017-10-312-3/+2
| * | | | fix spinach failureJames Lopez2017-10-311-0/+2
| * | | | uypdated keys controller logicJames Lopez2017-10-311-8/+2
| * | | | add applications controller logicJames Lopez2017-10-312-22/+15
| | |/ / | |/| |
* | | | Merge branch 'dm-remove-private-token' into 'master'Sean McGivern2017-11-026-24/+13
|\ \ \ \
| * | | | Move RSS and incoming email tokens from User Settings > Accounts to User Sett...Douwe Maan2017-11-021-2/+2
| * | | | Add sudo API scopeDouwe Maan2017-11-022-2/+2
| * | | | Consistently use PersonalAccessToken instead of PersonalTokenDouwe Maan2017-11-022-6/+6
| * | | | Remove authentication using user.private_tokenDouwe Maan2017-11-021-4/+3
| * | | | Remove Private Token from User Settings > AccountDouwe Maan2017-11-021-10/+0
| | |/ / | |/| |
* | | | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-023-70/+81
|/ / /
* | | Refactor/group links controllerFrancisco Javier López2017-11-011-7/+8
* | | Load participants asyncEric Eastwood2017-10-312-2/+2
* | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-2/+10
|/ /
* | Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-301-1/+1
|\ \
| * | use a delegate for `username` to be more future friendlyBrett Walker2017-10-271-2/+1
| * | fix to pass static-analysisBrett Walker2017-10-241-2/+2
| * | grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
* | | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-271-0/+2
* | | Revert "Merge branch '36670-remove-edit-form' into 'master'"39441-bring-edit-form-backSean McGivern2017-10-261-1/+9
* | | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-251-0/+4
* | | added feature specPhil Hughes2017-10-231-1/+0
* | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-231-0/+1
|/ /
* | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-221-0/+11
|\ \
| * | Make sure we render events for projects within a groupBob Van Landuyt2017-10-201-0/+11
| |/
* | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-201-1/+1
|/
* Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-0/+2
|\
| * Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-0/+2
* | Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-177-72/+76
|\ \
| * \ Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-171-0/+1
| |\ \
| | * | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-171-1/+1
| | * | Refactored multi-file data structurePhil Hughes2017-10-161-0/+1
| * | | Change project deletion message from alert to noticeWinnie Hellmann2017-10-171-1/+1
| * | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-71/+74
| |\ \ \
| | * | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-32/+39
| | * | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-121-1/+1
| | * | | Fix spinach featuresBob Van Landuyt2017-10-111-1/+1
View Lorry Controller Status