summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Implemented api for project jobs with working tests and updated docMichel Courtine2015-02-115-16/+231
| | | | |
| * | | | Merge pull request #550 from jvanbaarsen/redirect-to-root-when-valid-configJeroen van Baarsen2015-02-283-3/+17
| |\ \ \ \ | | |_|/ / | |/| | | Redirect to root path when application.yml config is valid
| | * | | Redirect to root path when application.yml config is validJeroen van Baarsen2015-02-283-3/+17
| | | |/ | | |/|
| * | | Merge pull request #555 from jvanbaarsen/rails-4-binstubsJeroen van Baarsen2015-02-287-0/+53
| |\ \ \ | | |/ / | |/| | Added the rails 4 binstubs and injected spring
| | * | Added the rails 4 binstubs and injected springJeroen van Baarsen2015-02-287-0/+53
| |/ / | | | | | | | | | | | | | | | | | | | | | * Added rails 4 binstubs with `rake rails:update:bin` * Injected spring all of them with `spring binstub --all` * Added Byebug for easier debugging Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | Merge pull request #554 from jvanbaarsen/fix-testsJeroen van Baarsen2015-02-283-5/+14
| |\ \ | | | | | | | | Semaphore does not like real git fetching, stub out the call
| | * | Semaphore does not like real git fetching, stub out the callJeroen van Baarsen2015-02-283-5/+14
| |/ / | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge branch 'update_changelog1' into 'master'Valery Sizov2015-02-271-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | Update changelog See merge request !123
| * | update changelogValery Sizov2015-02-271-1/+2
|/ /
* | Merge branch 'fix_show_button' into 'master'Dmitriy Zaporozhets2015-02-261-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Hide edit btn if use does not have permissions Fixes #159 See merge request !121
| * | Hide edit btn if use does not have permissionsValery Sizov2015-02-261-4/+5
| | |
* | | Merge branch 'delete_runner_endpoint' into 'master'Dmitriy Zaporozhets2015-02-264-1/+47
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Delete runner endpoint Fixes #152 See merge request !122
| * | delete runner endpointValery Sizov2015-02-264-1/+47
|/ /
* | Merge branch 'ui_improvements' into 'master'Dmitriy Zaporozhets2015-02-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix buttons color Fixes #158 See merge request !117
| * | Fix buttons colorValery Sizov2015-02-251-2/+2
| | |
* | | Merge branch 'ui_improvements_btn_name' into 'master'Dmitriy Zaporozhets2015-02-252-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Button edit job instead of edit project Fixes #157 See merge request !118
| * | | button edit job instead of edit projectValery Sizov2015-02-252-4/+4
| |/ /
* | | Merge branch 'rubocop' into 'master'Dmitriy Zaporozhets2015-02-2520-73/+1091
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Rubocop install Fixes #154 See merge request !120
| * | rubocop installValery Sizov2015-02-2520-73/+1091
|/ /
* | Merge branch 'link-to-runner-section' into 'master'Dmitriy Zaporozhets2015-02-253-3/+3
|\ \ | | | | | | | | | | | | | | | Link to runner section instead of repo. See merge request !116
| * | Link to runner section instead of repo.Sytse Sijbrandij2015-02-243-3/+3
| | |
* | | Merge branch 'reset_session' into 'master'Dmitriy Zaporozhets2015-02-254-27/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset user session if token is invalid closes #148 See merge request !115
| * | | reset user session if token is invalidValery Sizov2015-02-244-27/+32
| | | |
* | | | Merge branch 'gitattributes' into 'master'Valery Sizov2015-02-241-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Merge union CHANGELOG See merge request !42
| * | | Merge union CHANGELOGKamil Trzcinski2015-02-191-0/+2
| |/ /
* | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlab-ciValeriy Sizov2015-02-192-2/+67
|\ \ \
| * \ \ Merge branch 'update-config-7-8-ci' into 'master'Marin Jankovski2015-02-182-2/+67
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Updated update and install guide Updated guides for GitLab CI to 7.8 See merge request !114
| | * | Updated install guidePatricio Cano2015-02-161-2/+2
| | | |
| | * | Update guide to 7.8Patricio Cano2015-02-161-0/+65
| |/ /
* | | Merge branch 'changelog' into 'master'Valery Sizov2015-02-191-2/+3
|\ \ \ | |/ / |/| | | | | | | | | | | Updated changelog See merge request !41
| * | Updated CHANGELOGKamil Trzcinski2015-02-191-2/+3
|/ /
* | All information from the readme was moved to the website to make it more ↵Sytse Sijbrandij2015-02-161-103/+2
| | | | | | | | accessible.
* | Merge branch 'link-job-script-examples' into 'master'Dmitriy Zaporozhets2015-02-161-2/+4
|\ \ | | | | | | | | | | | | | | | Link job script examples See merge request !113
| * | Link to example job scripts.Sytse Sijbrandij2015-02-151-2/+4
| | |
* | | Move build script examples to something that is linked from the interface ↵Sytse Sijbrandij2015-02-162-15/+27
|/ / | | | | | | and the webpage.
* | Merge branch 'update_changelog' into 'master'Marin Jankovski2015-02-131-1/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | Update changelog #150 See merge request !112
| * | update changelogValery Sizov2015-02-131-1/+7
| | |
* | | Merge branch 'fix_docs_typo' into 'master'Valery Sizov2015-02-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in docs Changed `Dependancies` to `Dependencies` See merge request !40
| * | | Fix typo in docsErnest Walzel2015-02-111-1/+1
| |/ / | | | | | | | | | 'Dependancies' -> 'Dependencies'
* | | Merge branch 'branch_wildcard_fix' into 'master'Dmitriy Zaporozhets2015-02-123-5/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Skip refs: branch wildcard fix fixes bug found here !35 See merge request !38
| * | Fix skip_refs parameter, glob pattern implementationbranch_wildcard_fixValery Sizov2015-02-113-5/+4
| | |
* | | Merge pull request #543 from michaKFromParis/patch-1Valeriy Sizov2015-02-111-1/+1
|\ \ \ | | | | | | | | Fixed typo in gitlab ci api documentation
| * | | Fixed typo in gitlab ci api documentationMichel Courtine2015-02-071-1/+1
| |/ / | | | | | | project create does not take an id as a parameter
* | | Merge pull request #547 from awiddersheim/awiddersheim-patch-1Valeriy Sizov2015-02-111-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoAndrew Widdersheim2015-02-111-1/+1
|/ / /
* | | Revert "Implemented api for project jobs"Valery Sizov2015-02-115-206/+0
| | | | | | | | | | | | This reverts commit 0d39bfa32967c5f2794bdf30d088b74a78fd54c2.
* | | Merge branch 'feature_project_jobs_rest_api' into 'master'Valery Sizov2015-02-115-0/+206
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented project job get / post / delete through the rest api The rest API allows you to manipulate a project on gitlab-ci but there is no way to manipulate build jobs through the api. I tested it, implemented tests & updated documentation http://feedback.gitlab.com/forums/176466-general/suggestions/7068630-expose-the-job-api-to-the-rest-api Keep up the good work. It's the first ruby codebase I dig into and I'm impressed by it's robustness. Congratulations! See merge request !37
| * | | Implemented api for project jobsMichel Courtine2015-02-105-0/+206
| |/ /
* | | Merge branch 'fix-turbolink-on-gitlab-links' into 'master'Valery Sizov2015-02-114-7/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable turbolink on links pointing out to GitLab server ### What does this MR do? This MR adds 'data-no-turbolink' attribute into links pointing to GitLab server. ### Are there points in the code the reviewer needs to double check? No ### Why was this MR needed? In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript. This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them. ### What are the relevant issue numbers / Feature requests? I consider this a small fix, no issue has been added. See merge request !27
| * | | Disable turbolink on links pointing to gitlabBartlomiej Swiecki2015-02-054-7/+11
| |/ /