summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'repo-fixes-e' into 'master'Jacob Schatz2017-08-1412-86/+99
|\
| * 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-142-15/+3
| * Remove loading state from repo_tabEric Eastwood2017-08-141-4/+7
| * Make close/changed icon more accessibleEric Eastwood2017-08-141-2/+17
| * Use promise syntax with Helper.getContentEric Eastwood2017-08-142-10/+10
| * Split out linkClicked and add testsEric Eastwood2017-08-141-24/+21
| * 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-142-2/+2
|\ \
| * | Remove `\n` from translationsbvl-use-no-wrap-for-pot-fileBob Van Landuyt2017-08-142-2/+2
* | | Merge branch '36385-pipeline-graph-dropdown' into 'master'Phil Hughes2017-08-141-0/+21
|\ \ \
| * | | Stops propagation for dropdown content in pipeline graph. Applies the same be...36385-pipeline-graph-dropdownFilipa Lacerda2017-08-141-0/+21
* | | | Merge branch '34527-make-edit-comment-button-always-available-outside-of-drop...Clement Ho2017-08-145-53/+68
|\ \ \ \
| * | | | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-105-53/+68
* | | | | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-142-1/+11
|\ \ \ \ \
| * | | | | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-112-1/+11
* | | | | | 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 '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-144-16/+31
|\ \ \ \ \ \ \
| * | | | | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-141-9/+8
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1440-116/+661
| |\ \ \ \ \ \ \
| * | | | | | | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1146-191/+164
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-101-1/+2
| * | | | | | | | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-103-9/+21
| * | | | | | | | | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
| * | | | | | | | | Just detect exit status rather than check refLin Jen-Shin2017-08-101-1/+1
| * | | | | | | | | Fix some tests and report the error messageLin Jen-Shin2017-08-091-2/+2
| * | | | | | | | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-091-1/+4
* | | | | | | | | | Merge branch 'pagination-projects-explore' into 'master'Douwe Maan2017-08-144-5/+37
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-144-5/+37
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-08-142-41/+128
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | moved timeout to a variablefly-out-tunnelPhil Hughes2017-08-141-4/+8
| * | | | | | | | fixed up specs caused by left over elements in the bodyPhil Hughes2017-08-141-1/+2
| * | | | | | | | fixed JS error when no sidebar existsPhil Hughes2017-08-141-0/+3
| * | | | | | | | Add dynamic navigation tunnel to fly-out menusPhil Hughes2017-08-142-41/+120
* | | | | | | | | Merge branch '36133-project-overview-page-doesn-t-load-commit-metadata-for-re...Tim Zallmann2017-08-141-0/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into '36133-project-overview-page-doesn-t-load-commit-m...36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-viewMike Greiling2017-08-1053-168/+218
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix commit metadata in project:show pageMike Greiling2017-08-081-0/+3
* | | | | | | | | | Merge branch '36325-increase-z-index-pipeline-dropdown' into 'master'Phil Hughes2017-08-141-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Increase z-index of pipeline dropdown36325-increase-z-index-pipeline-dropdownAnnabel Dunstone Gray2017-08-111-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status