Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'improve-two_factor_authentication-doc' into 'master' 27220-jqxhr-responsejson-message-is-undefined-in-safari | Rémy Coutable | 2017-01-26 | 1 | -56/+54 |
|\ | |||||
| * | Update two_factor_authentication.md | William Abernathy | 2017-01-26 | 1 | -56/+54 |
* | | Merge branch 'improve-ci-yaml-doc' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Added hint about the execution order of before_script and artifact restoration. | ahorn42 | 2017-01-26 | 1 | -1/+1 |
* | | | Merge branch 'add_project_update_hook' into 'master' | Rémy Coutable | 2017-01-26 | 4 | -1/+26 |
|\ \ \ | |||||
| * | | | Add a system hook for when a project is updated. | Tommy Beadle | 2017-01-26 | 4 | -1/+26 |
* | | | | Merge branch 'patch-12' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | make a note to highlight 2FA needs time sync'd [ci skip] | Sergio Pieiga | 2017-01-26 | 1 | -2/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'official-merge-window-contributing-md' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -8/+0 |
|\ \ \ \ | |||||
| * | | | | Remove "official merge window" from CONTRIBUTING.md [ci skip] | Adam Niedzielski | 2017-01-26 | 1 | -8/+0 |
|/ / / / | |||||
* | | | | Merge branch 'patch-6' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -2/+9 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Add more precision about LDAP configuration | David | 2016-10-24 | 1 | -23/+10 |
| * | | | add an other ldap configuration example | David | 2016-10-10 | 1 | -1/+21 |
* | | | | Merge branch 'patch-10' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'patch-10' of gitlab.com:bennyp/gitlab-ce into patch-10 | Benny Powers | 2017-01-19 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | Removed duplicated content | Benny Powers | 2017-01-17 | 1 | -3/+0 |
| | * | | | | Corrected HAML markup in git_access.html.haml | Benny Powers | 2017-01-17 | 1 | -1/+7 |
| | * | | | | Added recommendation to install github-markdown | Benny Powers | 2016-12-15 | 1 | -0/+4 |
| * | | | | | Removed duplicated content | Benny Powers | 2017-01-19 | 1 | -3/+0 |
| * | | | | | Corrected HAML markup in git_access.html.haml | Benny Powers | 2017-01-19 | 1 | -1/+7 |
| * | | | | | Added recommendation to install github-markdown | Benny Powers | 2017-01-19 | 1 | -0/+4 |
* | | | | | | Merge branch 'mysql-sources-utf8mb4-fix' into 'master' | Rémy Coutable | 2017-01-26 | 3 | -7/+208 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7 | Guillaume Simon | 2017-01-12 | 3 | -7/+208 |
* | | | | | | Merge branch 'patch-11' into 'master' | Rémy Coutable | 2017-01-26 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo in examples | Koen Punt | 2017-01-11 | 1 | -2/+2 |
* | | | | | | | Merge branch 'patch-11' into 'master' | Achilleas Pipinellis | 2017-01-26 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update enviroments.md the example for deleting an environment is missing the ... | Kenneth Toley | 2017-01-06 | 1 | -1/+1 |
* | | | | | | | | Merge branch '27285-fix-broken-master' into 'master' | Sean McGivern | 2017-01-26 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Ensure we have a project with a repo in GitlabMarkdownHelper specs | Rémy Coutable | 2017-01-26 | 1 | -2/+1 |
* | | | | | | | | Merge branch 'contributing-md-accepting-merge-requests' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -14/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requ...contributing-md-accepting-merge-requests | Adam Niedzielski | 2017-01-26 | 1 | -14/+14 |
* | | | | | | | | | Merge branch 'rs-empty_project-lib' into 'master' | Rémy Coutable | 2017-01-26 | 65 | -103/+114 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use `:empty_project` where possible throughout spec/librs-empty_project-lib | Robert Speicher | 2017-01-25 | 65 | -103/+114 |
* | | | | | | | | | Merge branch '27178-update-builds-link-in-project-settings' into 'master' | Sean McGivern | 2017-01-26 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove markdown file extension and add anchor to link | Ryan Harris | 2017-01-25 | 1 | -1/+1 |
| * | | | | | | | | | Fixed builds info link on project settings page | Ryan Harris | 2017-01-25 | 2 | -1/+5 |
* | | | | | | | | | | Merge branch '26068_tasklist_issue' into 'master' | Sean McGivern | 2017-01-26 | 3 | -4/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Don’t count tasks that are not defined as list items correctly | Jarka Kadlecova | 2017-01-25 | 3 | -4/+27 |
* | | | | | | | | | | | Revert "Make sure TraceReader uses Encoding.default_external" | Lin Jen-Shin | 2017-01-26 | 2 | -15/+2 |
* | | | | | | | | | | | Make sure TraceReader uses Encoding.default_external | Lin Jen-Shin | 2017-01-26 | 2 | -2/+15 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs-empty_project-for-associations' into 'master' | Rémy Coutable | 2017-01-26 | 18 | -23/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use a project factory with a repository where necessaryrs-empty_project-for-associations | Robert Speicher | 2017-01-25 | 5 | -9/+15 |
| * | | | | | | | | | | Factories with a project association use `:empty_project` by default | Robert Speicher | 2017-01-24 | 14 | -14/+15 |
* | | | | | | | | | | | Merge branch 'rs-empty_project-helpers' into 'master' | Rémy Coutable | 2017-01-26 | 14 | -40/+41 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use `:empty_project` where possible in helper specsrs-empty_project-helpers | Robert Speicher | 2017-01-25 | 14 | -40/+41 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'rs-empty_project-controllers' into 'master' | Rémy Coutable | 2017-01-26 | 43 | -74/+67 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use `empty_project` where possible in controller specsrs-empty_project-controllers | Robert Speicher | 2017-01-25 | 43 | -74/+67 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'rs-empty_project-finders' into 'master' | Rémy Coutable | 2017-01-26 | 10 | -23/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use `:empty_project` where possible in finder specsrs-empty_project-finders | Robert Speicher | 2017-01-25 | 10 | -23/+23 |
* | | | | | | | | | | | | Merge branch '27203-fix-ruby21-broken-master' into 'master' | Rémy Coutable | 2017-01-26 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | |