summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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/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
| * | | | | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tabJacob Schatz2016-01-251-2/+2
| | |/ / / | |/| | | | | | | | | | | | | Fixes #2307
* | | | | Merge branch 'visibility-level-text-admin-area' into 'master' Douwe Maan2016-01-262-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility level texts on application settings Introduced by me through !2005 Before: ![Screenshot_from_2016-01-26_09-34-09](/uploads/fa3e8f2522a1d26372c7a06a81119e6f/Screenshot_from_2016-01-26_09-34-09.png) After: ![Screenshot_from_2016-01-26_09-34-27](/uploads/7955003dd02dd5376c9966aafdf4c50b/Screenshot_from_2016-01-26_09-34-27.png) See merge request !2611
| * | | | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-262-2/+3
|/ / / / / | | | | | | | | | | | | | | | Introduced by me through !2005
* | | | | Merge branch 'save-button-color-application-settings' into 'master' Douwe Maan2016-01-263-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save button on app settings now btn-save Some save buttons where `btn-primary` where throughout the application these usually are `btn-save`. Before (Application settings) ![Screenshot_from_2016-01-26_09-44-32](/uploads/f4019349c8bac6e0c91e23252a70d334/Screenshot_from_2016-01-26_09-44-32.png) After ![Screenshot_from_2016-01-26_09-45-20](/uploads/8e59a2b180832f44e3908b22187549af/Screenshot_from_2016-01-26_09-45-20.png) See merge request !2612
| * | | | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-266-64/+222
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track project import failure Fixes #12512 This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 See merge request !2538
| * | | | | Update CHANGELOGtrack-project-import-failureDouglas Barbosa Alexandre2016-01-261-0/+1
| | | | | |
| * | | | | Wrap errors on GitHub importer to raise Projects::ImportService::ErrorDouglas Barbosa Alexandre2016-01-262-7/+12
| | | | | |
| * | | | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-262-22/+29
| | | | | |
| * | | | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-253-39/+184
| | | | | |
* | | | | | Merge branch 'ci/test-build-artifacts-scripts' into 'master' Douwe Maan2016-01-262-0/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for clicking a row in build artifacts browser This adds a feature tests for clicking a row, which is handled by javascript event. /cc @ayufan See merge request !2551
| * | | | | Add tests for clicking a row in build artifacts browserci/test-build-artifacts-scriptsGrzegorz Bizon2016-01-222-0/+19
| | | | | |
* | | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-262-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
| * | | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-242-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12677
* | | | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-262-4/+28
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580
| * | | | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-232-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660
* | | | | | | Merge branch 'patch-1' into 'master' Stan Hu2016-01-261-5/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Slack integration configuration Adjusted to the current Slack version (as of I 2016). See merge request !2595
| * | | | | | | Update Slack integration configurationMarcin Zajączkowski2016-01-251-5/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update CHANGELOGRobert Speicher2016-01-251-0/+6
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-262-5/+124
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import redirect loop Fixes #11864 See merge request !2606
| * | | | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-252-5/+124
| | | | | |
* | | | | | Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-262-3/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct arity for instrumented methods w/o args This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes. See merge request !2602
| * | | | | | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-252-3/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that an instrumented method that doesn't take arguments reports an arity of 0, instead of -1. If Ruby had a proper method for finding out the required arguments of a method (e.g. Method#required_arguments) this would not have been an issue. Sadly the only two methods we have are Method#parameters and Method#arity, and both are equally painful to use. Fixes gitlab-org/gitlab-ce#12450
View Lorry Controller Status