summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+1
|\
| * Added setting to set new users by default as externalDravere2016-07-071-0/+1
* | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-6/+3
|\ \
| * | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-6/+3
* | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0715-83/+580
|\ \ \ | |_|/ |/| |
| * | Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-062-9/+9
| * | Add some more code comments.Douwe Maan2016-07-063-1/+16
| * | Add send_git_patch helperDouwe Maan2016-07-061-3/+3
| * | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-3/+13
| * | Allow reply-by-email with diff notesDouwe Maan2016-07-061-9/+1
| * | Add Gitlab::Git::PositionTracerDouwe Maan2016-07-061-0/+168
| * | Add Gitlab::Diff::LineMapperDouwe Maan2016-07-061-0/+64
| * | Add Gitlab::Git::PositionDouwe Maan2016-07-062-0/+182
| * | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-065-26/+38
| * | Style diff and blob file headers the same wayDouwe Maan2016-07-061-10/+5
| * | Add DiffFile#blob and #old_blobDouwe Maan2016-07-061-5/+21
| * | Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-061-0/+16
| * | Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-065-22/+49
| * | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-062-4/+4
* | | Merge branch 'fix/import-export-log' into 'master' Rémy Coutable2016-07-072-2/+2
|\ \ \ | |/ / |/| |
| * | fix log statements in import/exportJames Lopez2016-07-072-2/+2
* | | Consider that a GH exists only if both `ref`, and `sha` existDouglas Barbosa Alexandre2016-07-061-4/+8
* | | Doesn't trigger Git hooks when cleaning up restored branches from GitHubDouglas Barbosa Alexandre2016-07-061-1/+3
* | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-061-2/+6
|\ \ \
| * | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-051-1/+1
| * | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-051-1/+1
| * | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-051-2/+6
* | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-1/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | few more changes from suggestionsJames Lopez2016-06-301-1/+0
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-3024-266/+358
| |\ \ \
| * | | | use class methodJames Lopez2016-06-301-7/+8
| * | | | few changes based on feedbackJames Lopez2016-06-301-1/+9
* | | | | Merge branch 'fix/project-export-error' into 'master' Rémy Coutable2016-07-063-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix typofix/project-export-errorJames Lopez2016-07-061-1/+1
| * | | | even more debugJames Lopez2016-07-063-3/+5
* | | | | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-051-1/+1
* | | | | Default Git access protocol to `web`Patricio Cano2016-07-052-5/+3
* | | | | Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-051-2/+2
* | | | | Don't allow empty strings in the `protocol` check.Patricio Cano2016-07-051-1/+1
* | | | | Correct access control flow for Git HTTP requests.Patricio Cano2016-07-051-4/+4
* | | | | Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano2016-07-051-1/+1
* | | | | Raise an error if no protocol is passed to the GitAccess check.Patricio Cano2016-07-052-2/+3
* | | | | Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ...Patricio Cano2016-07-052-11/+5
* | | | | Only allow Git Access on the allowed protocolPatricio Cano2016-07-054-5/+37
* | | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-053-3/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-293-3/+24
* | | | | RailsCache metrics now includes fetch_hit/fetch_miss and read_hit/read_miss i...Paco Guzman2016-07-051-2/+12
* | | | | Instrument cache fetch hit and cache fetch missesPaco Guzman2016-07-051-0/+12
* | | | | Merge branch 'refactor/ci-config-move-global-entries' into 'master' Rémy Coutable2016-07-0519-139/+364
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add minor improvements in readability in CI configrefactor/ci-config-move-global-entriesGrzegorz Bizon2016-07-043-4/+3
View Lorry Controller Status