summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix dropdown header alignment; empty navbar positioningcleanup_old_nav_stuffAnnabel Dunstone Gray2017-10-072-18/+18
* Specify gitlab navAnnabel Dunstone Gray2017-10-062-6/+6
* Finish combining nav stylesAnnabel Dunstone Gray2017-10-066-479/+414
* Remove unnecessary testkushalpandya2017-10-061-6/+0
* Fix specsAnnabel Dunstone Gray2017-10-062-0/+6
* Conflict fixesAnnabel Dunstone Gray2017-10-061-4/+4
* Start moving new nav styles into header.scssAnnabel Dunstone Gray2017-10-0613-268/+76
* FixesAnnabel Dunstone Gray2017-10-065-129/+130
* Fix scrolling tabsAnnabel Dunstone Gray2017-10-062-0/+8
* Remove nav images; remove old nav styles; create new file for other navigatio...Annabel Dunstone Gray2017-10-0610-526/+343
* Merge branch '38872-fix-rspec-flaky-spec' into 'master'Stan Hu2017-10-061-0/+1
|\
| * Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener specRémy Coutable2017-10-061-0/+1
|/
* Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-069-34/+124
|\
| * Good old dangling commaide-fix-back-btnTim Zallmann2017-10-061-1/+1
| * Resetting of active Line + setting it for the async display functionsTim Zallmann2017-10-063-13/+22
| * Fixed Linting Error + Error with Line Highlighter found in TestTim Zallmann2017-10-052-3/+3
| * CHanged to Helper MethodTim Zallmann2017-10-051-1/+1
| * Removed the console.logTim Zallmann2017-10-051-1/+0
| * Refactored Highlighting mechanismTim Zallmann2017-10-054-16/+18
| * Optimising IfTim Zallmann2017-10-041-2/+2
| * Fixes the unhandled promise rejectionTim Zallmann2017-10-042-0/+3
| * Added Check for Line Number ElementTim Zallmann2017-10-041-1/+1
| * Fixed RepoFile TestTim Zallmann2017-10-042-9/+11
| * Fixed Repo Sidebar TestsTim Zallmann2017-10-042-37/+48
| * Added Test for Back Button BehaviourTim Zallmann2017-10-041-0/+32
| * Fixed Eslint ErrorsTim Zallmann2017-10-041-4/+4
| * Polished Back Button for files that are not in the tree anymoreTim Zallmann2017-10-041-1/+10
| * Fixed Back Button for files + line number jumping for preview and editorTim Zallmann2017-10-044-7/+30
* | Merge branch 'gitaly_feature_flag_metadata' into 'master'Rémy Coutable2017-10-062-2/+24
|\ \
| * | Gitaly feature flag metadataAndrew Newdigate2017-10-062-2/+24
|/ /
* | Merge branch '38775-scrollable-tabs-on-admin' into 'master'Filipa Lacerda2017-10-063-2/+7
|\ \
| * | Make tabs on top scrollable on admin dashboardTakuya Noguchi2017-10-053-2/+7
* | | Merge branch 'add-1000-plus-counters-for-jobs-page' into 'master'Yorick Peterse2017-10-066-6/+27
|\ \ \
| * | | Add 1000+ counters (instead of inifnite) to jobs controlleradd-1000-plus-counters-for-jobs-pageKamil Trzcinski2017-10-064-5/+21
| * | | Sort by id, not created_atjobs-sort-by-idKamil Trzcinski2017-09-262-1/+6
* | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-0674-3/+2910
|\ \ \ \
| * \ \ \ Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serviceShinya Maeda2017-10-077-41/+48
| |\ \ \ \
| | * | | | Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-067-41/+48
| * | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0787-270/+2102
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Shinya Maeda2017-10-062-2/+2
| |\ \ \ \ \
| | * | | | | Fix sidebar titleFilipa Lacerda2017-10-062-3/+3
| * | | | | | Use short path project_clusters_urlShinya Maeda2017-10-061-1/+1
| * | | | | | Change Clusters to Cluster in sidebarShinya Maeda2017-10-061-2/+2
| * | | | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0656-263/+763
| |\ \ \ \ \ \
| * | | | | | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-065-13/+57
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Filipa Lacerda2017-10-064-7/+12
| |\ \ \ \ \ \
| | * | | | | | Use utc for time comparisionShinya Maeda2017-10-064-7/+12
| * | | | | | | Fix margins in edit formFilipa Lacerda2017-10-062-11/+14
| |/ / / / / /
| * | | | | | Add some empty spacesKamil Trzcinski2017-10-051-0/+2
| * | | | | | Fix failing specKamil Trzcinski2017-10-051-2/+2
View Lorry Controller Status