summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* change message and change spec36450_confi_polishRegis2017-08-142-2/+2
* Merge branch 'repo-fixes-e' into 'master'Jacob Schatz2017-08-1415-116/+149
|\
| * Add shared getFileExtension helper methodrepo-fixes-eEric Eastwood2017-08-142-2/+7
| * Remove unused repo store keysEric Eastwood2017-08-142-17/+1
| * Add comment about why we need to stop parsing JSONEric Eastwood2017-08-141-0/+1
| * Use single js- wrapper class to show/hideEric Eastwood2017-08-144-8/+10
| * Scroll total scroll width instead of fixed valueEric Eastwood2017-08-141-1/+1
| * Switch single fa icon generation to inlineEric Eastwood2017-08-141-5/+1
| * Remove duplicate setting of variableEric Eastwood2017-08-141-1/+0
| * Reset monacoLoading on failureEric Eastwood2017-08-141-1/+4
| * Remove overflow tabs logic (no longer used)Eric Eastwood2017-08-143-26/+3
| * Remove loading state from repo_tabEric Eastwood2017-08-142-23/+8
| * Make close/changed icon more accessibleEric Eastwood2017-08-141-2/+17
| * Use promise syntax with Helper.getContentEric Eastwood2017-08-143-12/+13
| * Split out linkClicked and add testsEric Eastwood2017-08-142-24/+69
| * Use v-else instead of duplicating logicEric Eastwood2017-08-142-4/+18
| * Move syntax highlighting into a methodEric Eastwood2017-08-101-2/+8
* | Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'Rubén Dávila2017-08-1417-221/+167
|\ \
| * | Remove `\n` from translationsbvl-use-no-wrap-for-pot-fileBob Van Landuyt2017-08-1417-221/+167
* | | Merge branch '36378-error-raising-expectation-in-spec-fix' into 'master'Robert Speicher2017-08-141-2/+2
|\ \ \
| * | | Fix positive raise_error expectation without specifying the error type expect...36378-error-raising-expectation-in-spec-fixTiago Botelho2017-08-141-2/+2
* | | | Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-08-144-0/+72
|\ \ \ \
| * | | | Use rspec-parameterized for table-based testsNick Thomas2017-08-114-0/+72
* | | | | Merge branch '36385-pipeline-graph-dropdown' into 'master'Phil Hughes2017-08-142-0/+26
|\ \ \ \ \
| * | | | | Stops propagation for dropdown content in pipeline graph. Applies the same be...36385-pipeline-graph-dropdownFilipa Lacerda2017-08-142-0/+26
* | | | | | Merge branch '34527-make-edit-comment-button-always-available-outside-of-drop...Clement Ho2017-08-1414-78/+83
|\ \ \ \ \ \
| * | | | | | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-1014-78/+83
* | | | | | | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-144-1/+54
|\ \ \ \ \ \ \
| * | | | | | | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-114-1/+30
| * | | | | | | Add feature specs for Cycle Analytics pipeline summaryMehdi Lahmam2017-08-111-0/+24
* | | | | | | | Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'Rémy Coutable2017-08-141-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrsRobert Speicher2017-08-111-3/+3
* | | | | | | | | Merge branch '36404-do-not-run-flaky-examples-check-for-docs-changes' into 'm...Robert Speicher2017-08-141-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't run the `flaky-examples-check` job for docs branches36404-do-not-run-flaky-examples-check-for-docs-changesRémy Coutable2017-08-141-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'gitaly-test-bundle-path' into 'master'Rémy Coutable2017-08-142-7/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-pathJacob Vosmaer2017-08-112-7/+22
* | | | | | | | | | Merge branch '36236-auto-detect-metrics-for-auto-deployed-environments' into ...Rémy Coutable2017-08-146-15/+69
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-146-15/+69
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-1422-162/+223
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-142-11/+9
| * | | | | | | | | | Add comments about why we're stubbing them36089-handle-ref-failure-betterLin Jen-Shin2017-08-141-2/+2
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-14177-1081/+3756
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Skip creating the merge request if repo is emptyLin Jen-Shin2017-08-111-0/+2
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1163-98/+107
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Just use repository would fix the testLin Jen-Shin2017-08-111-4/+1
| * | | | | | | | | | | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
| * | | | | | | | | | | | Just use the repo. Not sure why master could passLin Jen-Shin2017-08-111-2/+2
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-11187-802/+1399
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix more testsLin Jen-Shin2017-08-117-119/+120
| * | | | | | | | | | | | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-106-20/+18
View Lorry Controller Status