summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add first shared examples to a helper and updated teaspoon_env to allow helpe...allow-shared-examples-jasmineLuke "Jared" Bennett2017-01-184-2/+48
* Merge branch '26756-fix-already-intialized-constant-warnings' into 'master' Robert Speicher2017-01-173-7/+0
|\
| * Remove some useless require_relative statements26756-fix-already-intialized-constant-warningsRémy Coutable2017-01-173-7/+0
* | Merge branch 'mr-tabs-alignment-sidebar-open' into 'master' Annabel Dunstone Gray2017-01-172-1/+9
|\ \
| * | Correctly keeps merge request tabs in place when editting value inmr-tabs-alignment-sidebar-openPhil Hughes2017-01-162-1/+9
* | | Merge branch 'rubocop-todo' into 'master' Grzegorz Bizon2017-01-171-2/+2
|\ \ \
| * | | Disable all cops in .rubocop_todo.ymlrubocop-todoSean McGivern2017-01-171-2/+2
* | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-1722-8/+540
|\ \ \ \
| * | | | Address MR commentsJarka Kadlecova2017-01-1311-26/+60
| * | | | refresh merge widget after using /merge commandJarka Kadlecova2017-01-115-0/+77
| * | | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-1115-8/+429
* | | | | Merge branch 'reduce-queries-milestone-index' into 'master' Sean McGivern2017-01-173-3/+10
|\ \ \ \ \
| * | | | | Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-indexAdam Niedzielski2017-01-103-3/+10
* | | | | | Merge branch 'fix/keep-artifacts-button-visibility' into 'master' Sean McGivern2017-01-175-9/+49
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibilityGrzegorz Bizon2017-01-16343-3496/+11342
| |\ \ \ \ \ \
| * | | | | | | Add method that checks for expiring build artifactsGrzegorz Bizon2017-01-094-17/+40
| * | | | | | | Add changelog for artifacts button visibility fixGrzegorz Bizon2017-01-091-0/+4
| * | | | | | | Do not show artifacts keep button if not allowedGrzegorz Bizon2017-01-092-8/+22
* | | | | | | | Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-177-21/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-128-22/+64
* | | | | | | | | Merge branch 'pmq20/gitlab-ce-psvr/persisted' into 'master' Robert Speicher2017-01-172-1/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Mark Commit persistedpmq20/gitlab-ce-psvr/persistedP.S.V.R2017-01-162-1/+9
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'switch-to-sassc' into 'master' Robert Speicher2017-01-173-8/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Switch to sassc-railsRichard Macklin2017-01-163-8/+17
* | | | | | | | Merge branch '19633-remove-rerun' into 'master' Robert Speicher2017-01-173-15/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-163-15/+0
* | | | | | | | | Merge branch 'refresh-authorizations-tighter-lease' into 'master' Robert Speicher2017-01-173-41/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-leaseYorick Peterse2017-01-163-41/+44
| |/ / / / / / / /
* | | | | | | | | Merge branch 'boards-sidebar-spec-fix' into 'master' Rémy Coutable2017-01-171-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed random issue boards sidebar failureboards-sidebar-spec-fixPhil Hughes2017-01-161-1/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master' Robert Speicher2017-01-162-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_specRémy Coutable2017-01-162-3/+3
|/ / / / / / / /
* | | | | | | | Merge branch '26616-fix-search-group-project-filters' into 'master' Alfredo Sumaran2017-01-164-1/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix dropdown filter input value after blur26616-fix-search-group-project-filtersEric Eastwood2017-01-164-2/+25
| * | | | | | | Fix group/project filters on search pageEric Eastwood2017-01-162-1/+7
* | | | | | | | Merge branch 'pipeline_index_mini_graph_fix' into 'master' Fatih Acet2017-01-161-13/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | phil said this is good - no need to dynamically update since this is a static...pipeline_index_mini_graph_fixRegis2017-01-151-49/+7
| * | | | | | | | works in browsers without sourceCapabilities APIRegis2017-01-151-1/+4
| * | | | | | | | update commented documentation to reflect new changesRegis2017-01-151-2/+3
| * | | | | | | | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-151-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix clicking url bar, browser UI, dev tools collapsing the mini_graphRegis2017-01-151-1/+3
| * | | | | | | | | fix UI without Promise or timeOut/intervalRegis2017-01-151-2/+9
| * | | | | | | | | fix UI behaviourRegis2017-01-151-1/+1
| * | | | | | | | | Merge branch 'master' into pipeline_index_mini_graph_fixRegis2017-01-15245-2922/+8355
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | make tests pass - change a bit of logicRegis2017-01-121-6/+8
| * | | | | | | | | | fixed issue - description in function (check diff)Regis2017-01-121-3/+23
* | | | | | | | | | | Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' Robert Speicher2017-01-167-114/+85
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a spec and actually display the flash noticeRémy Coutable2017-01-166-116/+82
| * | | | | | | | | | | Fix to display notice when project settings updated.sandish chen2017-01-154-3/+8
* | | | | | | | | | | | Merge branch '26207-add-hover-animations' into 'master' Annabel Dunstone Gray2017-01-1612-9/+145
|\ \ \ \ \ \ \ \ \ \ \ \