| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix invalid spec for generate_oauth_hmacsecure-oauth-state | Kamil Trzcinski | 2015-07-08 | 1 | -2/+2 |
| | | |||||
| * | Don't use return_to, but instead pass state with signed return_to parameter | Kamil Trzcinski | 2015-07-08 | 6 | -36/+42 |
| | | |||||
| * | Added random salt and hashing to oauth state parameter | Kamil Trzcinski | 2015-07-08 | 3 | -2/+106 |
| | | | | | This ensures that content of state is generated by CI, but doesn't prevent replay attacks on state parameter. | ||||
| * | Merge branch 'transparent-favicon' into 'master' | Valery Sizov | 2015-07-07 | 2 | -0/+0 |
| |\ | | | | | | | | | | | | | | | | | Transparent favicon Fixes #292 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !164 | ||||
| | * | Transparent favicon | Dmitriy Zaporozhets | 2015-07-03 | 2 | -0/+0 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'dpl-doc' into 'master' | Kamil Trzciński | 2015-07-06 | 5 | -0/+240 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation about the use of Dpl Please review. 1. Is that clear how to use Dpl? 2. Where the examples should be stored? 3. What should be else added? Maybe example for different provider? See merge request !170 | ||||
| | * | | Final touches | Kamil Trzcinski | 2015-07-06 | 2 | -11/+11 |
| | | | | |||||
| | * | | Split long lines | Kamil Trzcinski | 2015-07-06 | 3 | -11/+25 |
| | | | | |||||
| | * | | Better docs structure and fixed most of grammar | Kamil Trzcinski | 2015-07-06 | 3 | -65/+60 |
| | | | | |||||
| | * | | Added documentation about the use of Dpl | Kamil Trzcinski | 2015-07-06 | 5 | -0/+231 |
| | | | | |||||
| * | | | Merge branch 'docker-doc' into 'master' | Kamil Trzciński | 2015-07-06 | 1 | -0/+162 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | Added information about building projects using Docker /cc @JobV See merge request !178 | ||||
| | * | | Final touchesdocker-doc | Kamil Trzcinski | 2015-07-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Docker usage | Kamil Trzcinski | 2015-07-02 | 1 | -18/+45 |
| | | | | |||||
| | * | | Make the descriptions clearer | Kamil Trzcinski | 2015-06-26 | 1 | -12/+12 |
| | | | | |||||
| | * | | Fixed typo | Kamil Trzcinski | 2015-06-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added not-yet released docker feature configuration | Kamil Trzcinski | 2015-06-26 | 1 | -0/+135 |
| | | | | |||||
| * | | | Merge branch 'annotations' into 'master' | Valery Sizov | 2015-07-06 | 15 | -30/+87 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update annotations I don't think that we need entry in log for this change. /cc @vsizov See merge request !189 | ||||
| | * | | | Update annotationsannotations | Kamil Trzcinski | 2015-07-06 | 15 | -30/+87 |
| |/ / / | |||||
| * | | | Merge branch 'docker-image' into 'master' | Kamil Trzciński | 2015-07-06 | 12 | -24/+189 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for image and services in YAML - [x] Prepare changes for GitLab CI - [x] Prepare documentation (70% done): https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/178 - [x] Prepare GitLab Runner - changes are pushed to bleeding edge /cc @vsizov See merge request !181 | ||||
| | * | | | Added annotations | Kamil Trzcinski | 2015-07-06 | 3 | -0/+3 |
| | | | | | |||||
| | * | | | Added support for image and services | Kamil Trzcinski | 2015-07-06 | 12 | -24/+186 |
| |/ / / | |||||
| * | | | Merge branch 'access_token' into 'master' | Kamil Trzciński | 2015-07-06 | 3 | -8/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old sessions in order to force a new access_token access /cc @vsizov @jacobvosmaer See merge request !188 | ||||
| | * | | | Fix db/schema | Kamil Trzcinski | 2015-07-06 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Remove old sessions in order to force a new access_token access | Kamil Trzcinski | 2015-07-06 | 2 | -6/+9 |
| |/ / / | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci | Jacob Vosmaer | 2015-07-03 | 13 | -50/+43 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'oauth_everywhere' into 'master' | Dmitriy Zaporozhets | 2015-07-02 | 13 | -50/+43 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Refactoring: Get rid of private_token usage in the frontend See merge request !185 | ||||
| | | * | | Get rid of private message usageoauth_everywhere | Valery Sizov | 2015-07-02 | 13 | -50/+43 |
| | |/ / | |||||
| * | | | Add 7.12.2 CHANGELOG entries | Jacob Vosmaer | 2015-07-03 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge branch 'coverage' into 'master' | Valery Sizov | 2015-07-01 | 2 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Rounded coverage on commit page https://dev.gitlab.org/gitlab/gitlab-ci/issues/312 See merge request !184 | ||||
| | * | | Rounded coverage on commit page | Valery Sizov | 2015-07-01 | 2 | -3/+3 |
| |/ / | |||||
| * | | Merge branch 'favicon' into 'master' | Valery Sizov | 2015-06-30 | 2 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Change favicon https://dev.gitlab.org/gitlab/gitlab-ci/issues/292 See merge request !183 | ||||
| | * | | change favicon | Valery Sizov | 2015-06-30 | 2 | -0/+1 |
| |/ / | |||||
| * | | Merge branch 'redirect_back_after_auth' into 'master' | Valery Sizov | 2015-06-30 | 3 | -3/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Redirect back after authorization https://dev.gitlab.org/gitlab/gitlab-ci/issues/287 See merge request !182 | ||||
| | * | | satisfy rubocop | Valery Sizov | 2015-06-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | Redirect back after authorization | Valery Sizov | 2015-06-30 | 3 | -3/+5 |
| |/ / | |||||
| * | | update changelog | Valery Sizov | 2015-06-30 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'yaml-validation' into 'master' | Valery Sizov | 2015-06-30 | 2 | -37/+36 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Enhance YAML validation /cc @vsizov See merge request !180 | ||||
| | * | | Enhance YAML validation | Kamil Trzcinski | 2015-06-30 | 2 | -37/+36 |
| |/ / | |||||
| * | | Merge branch 'update_nokogiri' into 'master' | Valery Sizov | 2015-06-30 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update nokogiri version to remove warnings about libxml version mismatch. GitLab [is using this version of nokogiri](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-12-stable/Gemfile.lock#L378-379) too. The difference between current version and latest version is in multiple security and bug fixes as well as some features, see [their changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc). Reason why I've created this MR is that upgrading to 1.6.6.2 removes warnings about libxml version mismatch when running ci rake tasks in omnibus as shown here: gitlab-org/omnibus-gitlab#636 . See merge request !179 | ||||
| | * | | Update nokogiri version to remove warnings about libxml version mismatch. | Marin Jankovski | 2015-06-30 | 1 | -3/+3 |
| |/ / | |||||
| * | | Merge branch 'status_badge' into 'master' | Valery Sizov | 2015-06-29 | 2 | -1/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Build status Badge: unable to obtain code https://dev.gitlab.org/gitlab/gitlab-ci/issues/304 See merge request !177 | ||||
| | * | | Fix status badge | Valery Sizov | 2015-06-29 | 2 | -1/+3 |
| |/ / | |||||
| * | | Merge branch 'better_yaml_validation2' into 'master' | Valery Sizov | 2015-06-29 | 6 | -7/+30 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Improved validation of .gitlab-ci.yml https://dev.gitlab.org/gitlab/gitlab-ci/issues/305 See merge request !176 | ||||
| | * | | Improved validation of .gitlab-ci.yml | Valery Sizov | 2015-06-29 | 6 | -7/+30 |
| |/ / | |||||
| * | | Merge branch 'only_section' into 'master' | Valery Sizov | 2015-06-29 | 3 | -2/+14 |
| |\ \ | |/ |/| | | | | | | | | | | | Fix list of branches in only section https://gitlab.com/gitlab-org/gitlab-ci/issues/195 See merge request !174 | ||||
| | * | fix list of branches in only section | Valery Sizov | 2015-06-29 | 3 | -2/+14 |
| |/ | |||||
| * | coverage minor fix | Valery Sizov | 2015-06-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'coverage_fix' into 'master' | Valery Sizov | 2015-06-26 | 3 | -2/+29 |
| |\ | | | | | | | | | | | Fix coverage colcalation on the commit page See merge request !171 | ||||
| | * | fix coverage calculation on commit page | Valery Sizov | 2015-06-26 | 3 | -2/+29 |
| | | | |||||
| * | | Merge branch 'rake_env' into 'master' | Valery Sizov | 2015-06-26 | 2 | -0/+69 |
| |\ \ | |/ |/| | | | | | | | | | | | Implemented rake env:info https://dev.gitlab.org/gitlab/gitlab-ci/issues/298 See merge request !172 | ||||
 |
index : delta/gitlab/gitlab-ci.git | |
| gitlab.com: gitlab-org/gitlab-ci.git |
| summaryrefslogtreecommitdiff |