summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'diff-colors' into 'master' Robert Speicher2016-01-275-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase contrast between highlighted code comments and inline diff marker. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737. It was especially bad in Monokai, better now. See merge request !2629
| | * | | | | | | | | | | | | | Increase contrast between highlighted code comments and inline diff marker.diff-colorsDouwe Maan2016-01-275-8/+9
| | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-277-6/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI runner version not being properly updated when asked for a build Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again. See merge request !2618
| | * | | | | | | | | | | | | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-277-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again.
| * | | | | | | | | | | | | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-274-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a 404 instead of a 500 when accessing a non-existent group Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600 See merge request !2614
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-2730-141/+472
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/unexistent-group-500
| | * | | | | | | | | | | | | | | moved and refactored feature based on feedback. Also updated CHANGELOGJames Lopez2016-01-275-9/+9
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | fix for failing specJames Lopez2016-01-261-1/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | feature and fix for 500 on group missingJames Lopez2016-01-263-0/+10
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'rs-require-jquery-ui' into 'master' Dmitriy Zaporozhets2016-01-271-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit jquery-ui requires to what we actually use See merge request !2274
| | * | | | | | | | | | | | | | | Limit jquery-ui requires to what we actually users-require-jquery-uiRobert Speicher2016-01-251-1/+4
| | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a smoke test to run CI and see if we get back any JS errors.
| * | | | | | | | | | | | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-272-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement notice See merge request !2582
| | * | | | | | | | | | | | | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-232-7/+7
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'rs-issue-12672' into 'master' Dmitriy Zaporozhets2016-01-271-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove link from system hook Closes #12672 See merge request !2588
| | * | | | | | | | | | | | | | | Remove link from system hookrs-issue-12672Robert Speicher2016-01-241-2/+1
| | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12672
| * | | | | | | | | | | | | | | Merge branch 'rs-bump-octokit' into 'master' Dmitriy Zaporozhets2016-01-272-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump octokit to `~> 3.8.0` Closes #2877 See merge request !2536
| | * | | | | | | | | | | | | | | Bump octokit to `~> 3.8.0`rs-bump-octokitRobert Speicher2016-01-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2877
| * | | | | | | | | | | | | | | | Merge branch 'hot-reloading' into 'master' Douwe Maan2016-01-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hot reloading for CI API See merge request !2617
| | * | | | | | | | | | | | | | | Fix hot reloading for CI APIhot-reloadingKamil Trzcinski2016-01-261-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'doc_forking_refactor' into 'master' Achilleas Pipinellis2016-01-276-18/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor forking workflow documentation Closes #5974 See merge request !2623
| | * | | | | | | | | | | | | | | Refactor the forking process and add new imagesAchilleas Pipinellis2016-01-276-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | | | Conform to doc styleguide on max line lengthAchilleas Pipinellis2016-01-271-16/+24
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński2016-01-274-56/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use generic method to checks if artifacts are available Closes #12626 See merge request !2576
| | * | | | | | | | | | | | | | | | Update commit status factory to reflect recent changesfix/commit-status-artifactsGrzegorz Bizon2016-01-261-2/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add Changelog entry for undefined method fix in commit buildsGrzegorz Bizon2016-01-261-0/+3
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Add specs for build created using generic commit statusGrzegorz Bizon2016-01-262-55/+81
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Use generic method to checks if artifacts are availableGrzegorz Bizon2016-01-261-1/+1
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'typo_in_artifacts_doc' into 'master' Achilleas Pipinellis2016-01-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on artifacts doc See merge request !2622
| | * | | | | | | | | | | | | | | | Fix typo on artifacts docAchilleas Pipinellis2016-01-271-2/+2
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-261-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | Merge branch 'master' into 'master' Robert Speicher2016-01-275-2/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ExternalIssue regex for JIRA integration The pattern in the `::reference_pattern` class method in the `ExternalIssue` model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used. See merge request !2598
| | * | | | | | | | | | | | | | | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-265-2/+29
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used.
| * | | | | | | | | | | | | | | | Merge branch 'bug/jschatz1/file-browser-lines' into 'master' Dmitriy Zaporozhets2016-01-263-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug/jschatz1/file browser lines Fixes #12725 ![Screen_Shot_2016-01-26_at_11.19.39_AM](/uploads/c5f5a143926600e02de4cfc0687ed8dd/Screen_Shot_2016-01-26_at_11.19.39_AM.png) See merge request !2615
| | * | | | | | | | | | | | | | | | Adds margin top to readme holder so not flush.Jacob Schatz2016-01-261-0/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | adds border color to tables globally.Jacob Schatz2016-01-262-4/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix border color.bug/jschatz1/file-browser-linesJacob Schatz2016-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses `$border-color`
| | * | | | | | | | | | | | | | | | Revert "Styles for file list change."Jacob Schatz2016-01-264-36/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a14089485ff697d58dddb61e6da2d1b6c64a803e.
| | * | | | | | | | | | | | | | | | Revert "Adjusts styles of table tree"Jacob Schatz2016-01-262-34/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 111834883d287c89a24ae395900786d771214bdb.
| | * | | | | | | | | | | | | | | | Adjusts styles of table treeJacob Schatz2016-01-262-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12725
| | * | | | | | | | | | | | | | | | Styles for file list change.Jacob Schatz2016-01-264-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New download btn WIP.
| * | | | | | | | | | | | | | | | | Merge branch 'fix/bump-workhorse-version' into 'master' Robert Speicher2016-01-262-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Workhorse version to 0.6.2 Fix for #12634 has been introduced in gitlab-org/gitlab-workhorse!34. See merge request !2616
| | * | | | | | | | | | | | | | | | Add Changelog entry for missing artifacts in browser fixfix/bump-workhorse-versionGrzegorz Bizon2016-01-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been fixed in Workhorse [ci skip]
| | * | | | | | | | | | | | | | | | Bump Workhorse version to 0.6.2Grzegorz Bizon2016-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #12634 has been introduced in gitlab-org/gitlab-workhorse!34.
| * | | | | | | | | | | | | | | | | Merge branch ↵Dmitriy Zaporozhets2016-01-261-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'search-box-in-group-members-view-is-too-small-for-placeholder-in-chrome' into 'master' Fixes: Search box in Group Members view is too small for placeholder in Chrome Fixes #2498 ![Screen_Shot_2016-01-25_at_11.55.57_PM](/uploads/de4fda98cd8552641208b3a7a9277e35/Screen_Shot_2016-01-25_at_11.55.57_PM.png) See merge request !2609
| | * | | | | | | | | | | | | | | | Placeholder now visible completely.search-box-in-group-members-view-is-too-small-for-placeholder-in-chromeJacob Schatz2016-01-251-0/+10
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2498
| * | | | | | | | | | | | | | | | Merge branch 'monkey_patch' into 'master' Dmitriy Zaporozhets2016-01-261-0/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monkey patch for mysql 5.7 See merge request !2597
| | * | | | | | | | | | | | | | | | monkey patch for mysql 5.7monkey_patchValery Sizov2016-01-251-0/+48
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' Dmitriy Zaporozhets2016-01-261-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicks the edit button instead of opening the dropdown Fixes #2307 Instead of opening the menu, this clicks the `edit` button. See merge request !2607