summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for Dropdown Icon Positionicons-ci-iconsTim Zallmann2017-11-011-3/+3
|
* Needed to change 0px to 0Tim Zallmann2017-10-301-1/+1
|
* Missing Comma addedTim Zallmann2017-10-301-1/+1
|
* Fixed different sizesTim Zallmann2017-10-302-6/+33
|
* Added Missing SemicolonTim Zallmann2017-10-301-1/+1
|
* Improved Var Caching, Line Setup, SpecsTim Zallmann2017-10-303-18/+20
|
* fdescribe remove :-/Tim Zallmann2017-10-301-1/+1
|
* Updated icon.vue to be more inline with other components + added spec for itTim Zallmann2017-10-303-8/+49
|
* Lets try with trigger('click')Tim Zallmann2017-10-302-2/+2
|
* Fixes another problem that happens during knapsack testingTim Zallmann2017-10-301-1/+1
|
* Fixing Tests and CSS displayTim Zallmann2017-10-303-10/+18
|
* Fixes one icon testTim Zallmann2017-10-301-1/+1
|
* Test FixesTim Zallmann2017-10-303-3/+3
|
* Fixes for TestsTim Zallmann2017-10-3013-55/+34
|
* Update Action IconsTim Zallmann2017-10-3010-25/+20
|
* Fixing IconsTim Zallmann2017-10-3019-151/+112
|
* Updated also Badge + Dropdown IconsTim Zallmann2017-10-3020-22/+22
|
* Comma to muchTim Zallmann2017-10-301-1/+1
|
* Now one test works lets get the other one greenTim Zallmann2017-10-301-1/+1
|
* CHanged to String StatusesTim Zallmann2017-10-301-4/+4
|
* Need to render it into String cause its a content_tagTim Zallmann2017-10-301-2/+2
|
* Fixed SVG Output TestTim Zallmann2017-10-301-8/+4
|
* Fix the size of a status iconTim Zallmann2017-10-301-1/+1
|
* Updated Static Icons from CI AreaTim Zallmann2017-10-304-22/+25
|
* Merge branch '2518-saved-configuration-for-issue-board' into 'master'Phil Hughes2017-10-3016-93/+174
|\ | | | | | | | | [CE backport] Saved configuration for issue board See merge request gitlab-org/gitlab-ce!15009
| * [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-3016-93/+174
|/
* Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12
|\ | | | | | | | | | | | | Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
| * Use the correct project visibility in system hooksBob Van Landuyt2017-10-303-1/+12
| |
* | Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-304-1/+16
|\ \ | |/ |/| | | | | | | | | grab the correct username when confirming secondary email Closes #39366 See merge request gitlab-org/gitlab-ce!15010
| * more readable changelog39366-email-confirmation-failsBrett Walker2017-10-281-1/+1
| |
| * remove extra whitespaceBrett Walker2017-10-271-2/+2
| |
| * use a delegate for `username` to be more future friendlyBrett Walker2017-10-273-2/+11
| |
| * add changelog entryBrett Walker2017-10-271-0/+5
| |
| * fix to pass static-analysisBrett Walker2017-10-241-2/+2
| |
| * grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
| |
* | Merge branch 'es-module-autosave' into 'master'Filipa Lacerda2017-10-306-27/+17
|\ \ | | | | | | | | | | | | Remove Autosave class from global namespace See merge request gitlab-org/gitlab-ce!14856
| * \ Merge branch 'master' into 'es-module-autosave'es-module-autosaveMike Greiling2017-10-24925-9504/+22685
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/issuable_form.js # app/assets/javascripts/notes.js
| * | | remove import from main.jsMike Greiling2017-10-121-1/+0
| | | |
| * | | remove global exportMike Greiling2017-10-121-2/+0
| | | |
| * | | convert Autosave into pure es module and remove global exportMike Greiling2017-10-125-25/+18
| | | |
* | | | Merge branch 'docs/update-create-mr' into 'master'Marcia Ramos2017-10-274-13/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update docs on creating MRs See merge request gitlab-org/gitlab-ce!14982
| * | | | Update docs on creating MRsdocs/update-create-mrAchilleas Pipinellis2017-10-214-13/+10
| | | | |
* | | | | Merge branch 'use-git-branch-merged' into 'master'Rémy Coutable2017-10-2710-9/+121
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch the merged branches at once. Checking it one by one in the view. We don't cache this yet because this would already much improve the performance. A naive test against a particularly large repository: ``` ruby begin now = Time.now branches.map{ |b| r.merged_to_root_ref?(b.name) } Time.now - now end # 8.265830782 ``` Around 10 times faster: ``` ruby begin now = Time.now r.merged_branches(branches.map(&:name)) Time.now - now end # 0.807405397 ``` This should make the branches page usable. See merge request gitlab-org/gitlab-ce!14729
| * | | | | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-2710-9/+121
|/ / / / /
* | | | | Merge branch 'docs-update-ee_features.md-ce' into 'master'Rémy Coutable2017-10-271-0/+382
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move doc/development/ee_features.md to CE See merge request gitlab-org/gitlab-ce!15066
| * | | | | Merging EE doc into CEdocs-update-ee_features.md-ceLin Jen-Shin2017-10-271-0/+382
|/ / / / /
* | | | | Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-278-21/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863
| * | | | | Cache commits on the repository modelZeger-Jan van de Weg2017-10-278-21/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, when requesting a commit from the Repository model, the results are not cached. This means we're fetching the same commit by oid multiple times during the same request. To prevent us from doing this, we now cache results. Caching is done only based on object id (aka SHA). Given we cache on the Repository model, results are scoped to the associated project, eventhough the change of two repositories having the same oids for different commits is small.
* | | | | | Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'Sean McGivern2017-10-271-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using Rugged in Gitlab::Git::Wiki#preview_slug See merge request gitlab-org/gitlab-ce!15054
| * | | | | | Avoid using Rugged in Gitlab::Git::Wiki#preview_slugAhmad Sherif2017-10-271-1/+10
| | | | | | |
View Lorry Controller Status