summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-275-0/+61
* Merge branch 'improve-two_factor_authentication-doc' into 'master' 27220-jqxhr-responsejson-message-is-undefined-in-safariRémy Coutable2017-01-261-56/+54
|\
| * Update two_factor_authentication.mdWilliam Abernathy2017-01-261-56/+54
* | Merge branch 'improve-ci-yaml-doc' into 'master' Rémy Coutable2017-01-261-1/+1
|\ \
| * | Added hint about the execution order of before_script and artifact restoration.ahorn422017-01-261-1/+1
* | | Merge branch 'add_project_update_hook' into 'master' Rémy Coutable2017-01-264-1/+26
|\ \ \
| * | | Add a system hook for when a project is updated.Tommy Beadle2017-01-264-1/+26
* | | | Merge branch 'patch-12' into 'master' Rémy Coutable2017-01-261-2/+6
|\ \ \ \
| * | | | make a note to highlight 2FA needs time sync'd [ci skip]Sergio Pieiga2017-01-261-2/+6
| | |/ / | |/| |
* | | | Merge branch 'official-merge-window-contributing-md' into 'master' Rémy Coutable2017-01-261-8/+0
|\ \ \ \
| * | | | Remove "official merge window" from CONTRIBUTING.md [ci skip] Adam Niedzielski2017-01-261-8/+0
|/ / / /
* | | | Merge branch 'patch-6' into 'master' Rémy Coutable2017-01-261-2/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add more precision about LDAP configurationDavid2016-10-241-23/+10
| * | | add an other ldap configuration exampleDavid2016-10-101-1/+21
* | | | Merge branch 'patch-10' into 'master' Rémy Coutable2017-01-261-0/+7
|\ \ \ \
| * \ \ \ Merge branch 'patch-10' of gitlab.com:bennyp/gitlab-ce into patch-10Benny Powers2017-01-190-0/+0
| |\ \ \ \
| | * | | | Removed duplicated contentBenny Powers2017-01-171-3/+0
| | * | | | Corrected HAML markup in git_access.html.hamlBenny Powers2017-01-171-1/+7
| | * | | | Added recommendation to install github-markdownBenny Powers2016-12-151-0/+4
| * | | | | Removed duplicated contentBenny Powers2017-01-191-3/+0
| * | | | | Corrected HAML markup in git_access.html.hamlBenny Powers2017-01-191-1/+7
| * | | | | Added recommendation to install github-markdownBenny Powers2017-01-191-0/+4
* | | | | | Merge branch 'mysql-sources-utf8mb4-fix' into 'master'Rémy Coutable2017-01-263-7/+208
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7Guillaume Simon2017-01-123-7/+208
* | | | | | Merge branch 'patch-11' into 'master' Rémy Coutable2017-01-260-0/+0
|\ \ \ \ \ \
| * | | | | | Fix typo in examplesKoen Punt2017-01-111-2/+2
* | | | | | | Merge branch 'patch-11' into 'master' Achilleas Pipinellis2017-01-260-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Update enviroments.md the example for deleting an environment is missing the ...Kenneth Toley2017-01-061-1/+1
* | | | | | | | Merge branch '27285-fix-broken-master' into 'master' Sean McGivern2017-01-261-2/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Ensure we have a project with a repo in GitlabMarkdownHelper specsRémy Coutable2017-01-261-2/+1
* | | | | | | | Merge branch 'contributing-md-accepting-merge-requests' into 'master' Rémy Coutable2017-01-261-14/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requ...contributing-md-accepting-merge-requestsAdam Niedzielski2017-01-261-14/+14
* | | | | | | | | Merge branch 'rs-empty_project-lib' into 'master' Rémy Coutable2017-01-2665-103/+114
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-2565-103/+114
* | | | | | | | | Merge branch '27178-update-builds-link-in-project-settings' into 'master' Sean McGivern2017-01-262-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove markdown file extension and add anchor to linkRyan Harris2017-01-251-1/+1
| * | | | | | | | | Fixed builds info link on project settings pageRyan Harris2017-01-252-1/+5
* | | | | | | | | | Merge branch '26068_tasklist_issue' into 'master' Sean McGivern2017-01-263-4/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don’t count tasks that are not defined as list items correctlyJarka Kadlecova2017-01-253-4/+27
* | | | | | | | | | | Revert "Make sure TraceReader uses Encoding.default_external"Lin Jen-Shin2017-01-262-15/+2
* | | | | | | | | | | Make sure TraceReader uses Encoding.default_externalLin Jen-Shin2017-01-262-2/+15
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-2618-23/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-255-9/+15
| * | | | | | | | | | Factories with a project association use `:empty_project` by defaultRobert Speicher2017-01-2414-14/+15
* | | | | | | | | | | Merge branch 'rs-empty_project-helpers' into 'master' Rémy Coutable2017-01-2614-40/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use `:empty_project` where possible in helper specsrs-empty_project-helpersRobert Speicher2017-01-2514-40/+41
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs-empty_project-controllers' into 'master' Rémy Coutable2017-01-2643-74/+67
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2543-74/+67
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs-empty_project-finders' into 'master' Rémy Coutable2017-01-2610-23/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use `:empty_project` where possible in finder specsrs-empty_project-findersRobert Speicher2017-01-2510-23/+23
View Lorry Controller Status