summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disable Rubocopsh-rubocop-thread-safetyStan Hu2017-10-064-12/+6
* Disable thread safety checks for migrationsStan Hu2017-10-064-0/+6
* Revert "Make reference patterns thread-safe"Stan Hu2017-10-069-79/+59
* Make reference patterns thread-safeStan Hu2017-10-069-59/+79
* Add rubocop-thread_safety checksStan Hu2017-10-063-0/+5
* Merge branch 'issue_35873' into 'master'Jacob Schatz2017-10-0777-270/+3318
|\
| * Commenting on image diffsFelipe Artur2017-10-0777-270/+3318
|/
* Merge branch 'backport-protected-branches-spec-changes' into 'master'Mike Greiling2017-10-061-9/+17
|\
| * backport protected_branches_spec improvements from EEbackport-protected-branches-spec-changesJose Ivan Vargas2017-10-061-9/+17
* | Merge branch 'fl-38869-linked-tabs' into 'master'Mike Greiling2017-10-061-3/+0
|\ \
| * \ Merge branch 'master' into fl-38869-linked-tabsfl-38869-linked-tabsFilipa Lacerda2017-10-06195-1163/+5187
| |\ \
| * | | Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classesFilipa Lacerda2017-10-061-3/+0
* | | | Merge branch '36255-metrics-that-do-not-have-a-complete-history-are-not-shown...Fatih Acet2017-10-063-1/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | add CHANGELOG.md entry for !1474136255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-allMike Greiling2017-10-061-0/+5
| * | | allow legend to properly handle NaN valuesMike Greiling2017-10-061-1/+5
| * | | allow prometheus graphs to handle non-congiuous paths (with NaN, +Inf, and -Inf)Mike Greiling2017-10-061-0/+4
| | |/ | |/|
* | | Merge branch 'winh-delete-account-modal' into 'master'Fatih Acet2017-10-0617-30/+507
|\ \ \ | |/ / |/| |
| * | Show confirmation modal before deleting accountWinnie Hellmann2017-10-0617-30/+507
|/ /
* | 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