summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Extract CI configuration entry node factory methodGrzegorz Bizon2016-07-041-8/+12
| * | | | Improve description of CI types node and in specsGrzegorz Bizon2016-06-301-1/+1
| * | | | Explicitly define entry node class in new CI configGrzegorz Bizon2016-06-292-11/+11
| * | | | Add CI config entry validator for allowed keysGrzegorz Bizon2016-06-294-18/+17
| * | | | Return compound value if CI config node is compositeGrzegorz Bizon2016-06-291-1/+6
| * | | | Move global CI cache configuration to new CI classesGrzegorz Bizon2016-06-292-29/+3
| * | | | Add global cache config entry to new CI configGrzegorz Bizon2016-06-295-6/+19
| * | | | Add CI config entry location info to error messageGrzegorz Bizon2016-06-292-7/+9
| * | | | Make it possible to set parent in CI config nodeGrzegorz Bizon2016-06-292-3/+4
| * | | | Merge branch 'master' into refactor/ci-config-move-global-entriesGrzegorz Bizon2016-06-2840-253/+557
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Validate interface only with CI node validatorGrzegorz Bizon2016-06-272-15/+17
| * | | | Add new ci config entry that handles cache configGrzegorz Bizon2016-06-273-12/+58
| * | | | Add ci config entry that represents array of pathsGrzegorz Bizon2016-06-241-0/+18
| * | | | Add ci config class that represents a boolean valueGrzegorz Bizon2016-06-242-0/+28
| * | | | Add ci config class that represents a key valueGrzegorz Bizon2016-06-242-0/+28
| * | | | Fix ci config cache validation in legacy processorGrzegorz Bizon2016-06-241-2/+2
| * | | | Minor refactorings in new CI configuration classesGrzegorz Bizon2016-06-234-4/+8
| * | | | Move CI stages configuration to new CI configGrzegorz Bizon2016-06-238-22/+59
| * | | | Assume that unspecified CI config is undefinedGrzegorz Bizon2016-06-233-13/+12
| * | | | Return default config value when entry is undefinedGrzegorz Bizon2016-06-226-20/+32
| * | | | Handle CI environment variables in a new CI configGrzegorz Bizon2016-06-225-6/+38
| * | | | Rename CI config null node entry to undefined nodeGrzegorz Bizon2016-06-223-16/+9
| * | | | Return CI entry config as value by defaultGrzegorz Bizon2016-06-214-14/+3
View Lorry Controller Status