summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Thanks Robert for the corrections in the environment variables docs.environment-variables-in-the-appSytse Sijbrandij2015-12-282-2/+2
|
* Add documentation and example file for environent variables.Sytse Sijbrandij2015-12-272-0/+54
|
* Use environment variables to configure GitLab.Sytse Sijbrandij2015-12-272-1/+2
|
* Merge branch 'grammar_fix' into 'master' Achilleas Pipinellis2015-12-261-1/+1
|\ | | | | | | | | | | | | Fix typo on triggers docs See merge request !2214
| * Fix typo on triggers docs [ci skip]Achilleas Pipinellis2015-12-261-1/+1
|/
* Merge branch 'fix_triggers_doc' into 'master' Achilleas Pipinellis2015-12-261-3/+0
|\ | | | | | | | | | | | | Remove incomplete text on triggers doc See merge request !2213
| * Remove incomplete text [ci skip]Achilleas Pipinellis2015-12-261-3/+0
|/
* Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-255-11/+138
|\ | | | | | | | | | | | | open and close issue via ajax request. With tests Close and Reopen issues with ajax request. See merge request !2164
| * removes unused `alert` from issue spec. Requires flash in the ↵close-open-ajax-issueJacob Schatz2015-12-233-8/+3
| | | | | | | | *implementation* instead of the spec.
| * adds test for issue close/reopen failureJacob Schatz2015-12-233-6/+63
| |
| * resolves conflicts with new buttonsJacob Schatz2015-12-23127-373/+3032
| |\
| * | fixes tests to work with jasmine/jqueryJacob Schatz2015-12-232-13/+16
| | |
| * | changes `issue-box` to `status-box` since html was changed as wellJacob Schatz2015-12-211-9/+9
| | |
| * | adds alerts for when http request errors out in some way.Jacob Schatz2015-12-212-10/+3
| | |
| * | removes console logsJacob Schatz2015-12-211-1/+0
| | |
| * | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-212-3/+4
| | |
| * | clarifies tests with methods like `toBeVisible()` etc.Jacob Schatz2015-12-211-12/+9
| | |
| * | updates tests style for four-phase-testing as per: ↵Jacob Schatz2015-12-211-1/+17
| | | | | | | | | | | | https://robots.thoughtbot.com/four-phase-test
| * | removes `console.log`sJacob Schatz2015-12-211-2/+0
| | |
| * | open and close issue via ajax request. With testsJacob Schatz2015-12-215-10/+78
| | |
* | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-258-16/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV ![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png) See merge request !2206
| * | | satisfy rubocoprevert_votes_backValery Sizov2015-12-251-1/+1
| | | |
| * | | fix spinachValery Sizov2015-12-251-3/+5
| | | |
| * | | add sorting of awardsValery Sizov2015-12-254-2/+21
| | | |
| * | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-254-11/+25
| | | |
* | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-2511-8/+262
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Open Graph meta tags See merge request !2192
| * | | | Add link to twitter docsDouwe Maan2015-12-251-1/+2
| | | | |
| * | | | Add more twitter metatags.Douwe Maan2015-12-251-0/+6
| | | | |
| * | | | Add og:site_nameDouwe Maan2015-12-251-2/+2
| | | | |
| * | | | Satisfy RubocopDouwe Maan2015-12-251-2/+2
| | | | |
| * | | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-247-4/+86
| | | | |
| * | | | Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
| | | | |
| * | | | Truncate page_description to 30 wordsRobert Speicher2015-12-242-2/+15
| | | | |
| * | | | Account for `@project.description` being nilRobert Speicher2015-12-232-1/+9
| | | | |
| * | | | Add page descriptions and imagesRobert Speicher2015-12-237-9/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
| * | | | Add gitlab_logo.png, remove brand_logo.pngRobert Speicher2015-12-232-0/+0
| | | | |
| * | | | Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
| | | | |
* | | | | Merge branch 'adding_crime_security' into 'master' Achilleas Pipinellis2015-12-252-0/+64
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding CRIME Vulnerability to Security doc Added an additional page to the security section that goes over current status and fixes for the TLS Protocol CRIME Vulnerability. Also added its respective link at the security README. Any suggestions appreciated @JobV @sytses See merge request !2102
| * | | | Clean up CRIME security doc [ci skip]Achilleas Pipinellis2015-12-251-37/+41
| | | | |
| * | | | Merge branch 'master' into adding_crime_securityAchilleas Pipinellis2015-12-25228-868/+18553
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'ci_triggers_docs' into 'master' Achilleas Pipinellis2015-12-257-20/+197
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation on CI triggers Closes #3432 ## Notes * Implement build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/229 * Build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/issues/257 * Build pipeline - https://dev.gitlab.org/gitlab/gitlab-ci/issues/282 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3743 * Dependent builds - https://dev.gitlab.org/gitlab/gitlab-ci/issues/328 * Travis docs - https://docs.travis-ci.com/user/triggering-builds/ * Custom variables Circle CI example - https://circleci.com/docs/nightly-builds * Triggers API (CI) will be done in a separate MR * Notify https://gitlab.com/gitlab-org/gitlab-ci/issues/368 once done ## Docs needed to change - [x] `doc/ci/README.md` - [x] `doc/README.md` See merge request !2161
| * | | | | Add examples for triggers [ci skip]Achilleas Pipinellis2015-12-251-5/+76
| | | | | |
| * | | | | Merge branch 'master' into ci_triggers_docsci_triggers_docsAchilleas Pipinellis2015-12-25208-820/+18111
| |\ \ \ \ \
| * | | | | | Add images and examplesAchilleas Pipinellis2015-12-255-2/+95
| | | | | | |
| * | | | | | Remove triggers from yaml doc [ci skip]Achilleas Pipinellis2015-12-241-27/+0
| | | | | | |
| * | | | | | Add triggers doc in top level readme [ci skip]Achilleas Pipinellis2015-12-241-5/+6
| | | | | | |
| * | | | | | Document triggers in yaml/README.md [ci skip]Achilleas Pipinellis2015-12-211-0/+27
| | | | | | |
| * | | | | | Init documentation on Triggers [ci skip]Achilleas Pipinellis2015-12-212-19/+31
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'support-api-lookup-by-username' into 'master' Dmitriy Zaporozhets2015-12-254-5/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API support for looking up a user by username Needed to support Huboard See merge request !2089
| * | | | | | Add API support for looking up a user by usernameStan Hu2015-12-244-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to support Huboard
View Lorry Controller Status